diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:49:29 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-02-05 22:49:29 +0300 |
| commit | 250c9de1bc1293141acf87cae8716bd63b7e216c (patch) | |
| tree | 7b32c7ee52a2b11029b9c2b27c426dadff82e724 /source | |
| parent | 3700984c994b68d26a06cd62aaab822b346236ad (diff) | |
Adds ffmpeg-support on Linux-platforms. Since ffmpeg is installed
always statically (you have to force it to build a dynamic library) the
resulting binary is redistributable.
The code is made ffmpeg-version independent using #ifdef's.
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 7 | ||||
| -rw-r--r-- | source/nan_link.mk | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/source/Makefile b/source/Makefile index ce1a6851884..cc679b2ddda 100644 --- a/source/Makefile +++ b/source/Makefile @@ -150,6 +150,7 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(NAN_BULLET)/lib/libbullet.a endif COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a + COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index c7822683521..0dcee374058 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -105,7 +105,7 @@ endif export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/IlmImf -I$(NAN_OPENEXR)/include/Imath -I$(NAN_OPENEXR)/include/Iex endif else - export NAN_OPENEXR ?= /usr/local + export NAN_OPENEXR ?= /usr export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a endif @@ -342,7 +342,8 @@ endif # enable freetype2 support for text objects export WITH_FREETYPE2 ?= true - + # enable ffmpeg support + export WITH_FFMPEG ?= true else ifeq ($(OS),openbsd) @@ -479,7 +480,7 @@ endif # enable freetype2 support for text objects export WITH_FREETYPE2 ?= true - + # enable quicktime support # export WITH_QUICKTIME ?= true diff --git a/source/nan_link.mk b/source/nan_link.mk index c201b79a412..16a3e3eff94 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -47,7 +47,7 @@ endif ######################## OS dependencies (alphabetic!) ################ - # default (overriden by windows) +# default (overriden by windows) SOEXT = .so ifeq ($(OS),beos) @@ -100,7 +100,7 @@ ifeq ($(OS),linux) ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64")) COMMENT = "MESA 3.1" LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi - LLIBS += -lutil -lc -lm -ldl -lpthread + LLIBS += -lutil -lc -lm -ldl -lpthread -lopenal -lavformat -lavcodec -lavutil -ldts -lz # LLIBS += -L$(NAN_ODE)/lib -lode LOPTS = -export-dynamic DADD = -lGL -lGLU |