diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-08-14 16:47:13 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-08-14 16:47:13 +0400 |
| commit | 800ae7cf466dd50c15c3ecf655f68e0d43de12f2 (patch) | |
| tree | 7aa76990341b49572163225210ffc20f2d76336e /tools | |
| parent | 404ccd1a07a5b2d5f649f3403ced9cc37f4556b8 (diff) | |
[ #4035 ] patch to make scons compile with ffmpeg in mingw
Submitted by Joseph Eagar (joeedh). windows/gcc ffmpeg library may need recompiling to support all codecs necessary (ie. H264 doesn't work).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 1 | ||||
| -rwxr-xr-x | tools/btools.py | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 8c334a70536..c1e43d9ceeb 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -119,6 +119,7 @@ def setup_staticlibs(lenv): lenv['BF_ICONV_LIBPATH'] ] libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + libincs += Split(lenv['BF_FFMPEG_LIBPATH']) if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) diff --git a/tools/btools.py b/tools/btools.py index b66d388ec76..6f3c8537c68 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -21,7 +21,7 @@ def validate_arguments(args, bc): 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_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_FFMPEG', 'BF_FFMPEG_LIB', 'BF_FFMPEG', 'BF_FFMPEG_INC', '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', @@ -146,8 +146,11 @@ def read_opts(cfg, args): ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')), + ('BF_FFMPEG', 'FFMPEG base path', ''), ('BF_FFMPEG_LIB', 'FFMPEG library', ''), - + ('BF_FFMPEG_INC', 'FFMPEG includes', ''), + ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''), + (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')), ('BF_JPEG', 'JPEG base path', ''), ('BF_JPEG_INC', 'JPEG include path', ''), |