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_link.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_link.mk')
-rw-r--r--source/nan_link.mk4
1 files changed, 2 insertions, 2 deletions
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