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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/Blender.py | 2 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 27365f4aab4..377e96f3d76 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -139,6 +139,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_ICONV_LIB']) if lenv['WITH_BF_OPENEXR']: syslibs += Split(lenv['BF_OPENEXR_LIB']) + if lenv['WITH_BF_FFMPEG']: + syslibs += Split(lenv['BF_FFMPEG_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) syslibs += Split(lenv['BF_OPENGL_LIB']) syslibs += Split(lenv['LLIBS']) diff --git a/tools/btools.py b/tools/btools.py index 6dfbc792a85..8a9f08e5f22 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -20,6 +20,7 @@ def validate_arguments(args, bc): 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'WITH_BF_FMOD', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', + 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'BF_TIFF', 'BF_TIFF_INC', @@ -137,6 +138,9 @@ def read_opts(cfg, args): ('BF_OPENEXR_LIB', 'OPENEXR library', ''), ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), + (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')), + ('BF_FFMPEG_LIB', 'FFMPEG library', ''), + (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')), ('BF_JPEG', 'JPEG base path', ''), ('BF_JPEG_INC', 'JPEG include path', ''), |