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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | source/Makefile | 1 |
1 files changed, 1 insertions, 0 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 |