Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Schlaile <peter@schlaile.de>2006-02-05 22:49:29 +0300
committerPeter Schlaile <peter@schlaile.de>2006-02-05 22:49:29 +0300
commit250c9de1bc1293141acf87cae8716bd63b7e216c (patch)
tree7b32c7ee52a2b11029b9c2b27c426dadff82e724 /source/nan_definitions.mk
parent3700984c994b68d26a06cd62aaab822b346236ad (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/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk7
1 files changed, 4 insertions, 3 deletions
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