diff options
-rw-r--r-- | config/win32-mingw-config.py | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 1 | ||||
-rw-r--r-- | source/blender/imbuf/SConscript | 1 | ||||
-rw-r--r-- | source/blender/src/SConscript | 1 | ||||
-rw-r--r-- | tools/Blender.py | 1 | ||||
-rwxr-xr-x | tools/btools.py | 7 |
6 files changed, 15 insertions, 2 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 5d256300685..6a4aed6503f 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -12,6 +12,12 @@ BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' +WITH_BF_FFMPEG = 'false' +BF_FFMPEG = LCGDIR + '/gcc/ffmpeg' +BF_FFMPEG_LIB = 'avformat avutil avcodec' +BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib' +BF_FFMPEG_INC = '${BF_FFMPEG}/include' + WITH_BF_SDL = 'true' BF_SDL = LCGDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index aed4ad6ed4c..3221696d21a 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -22,6 +22,7 @@ if env['WITH_BF_OPENEXR'] == 1: if env['WITH_BF_FFMPEG'] == 1: defs += ' WITH_FFMPEG' + incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_QUICKTIME'] == 1: defs += ' WITH_QUICKTIME' diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index 93041ab97cf..0d9b9fbe81b 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -18,6 +18,7 @@ if env['WITH_BF_OPENEXR'] == 1: if env['WITH_BF_FFMPEG'] == 1: defs.append('WITH_FFMPEG') + incs += ' ' + env['BF_FFMPEG_INC'] if env['WITH_BF_QUICKTIME']==1: incs += ' ' + env['BF_QUICKTIME_INC'] diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index fdd920e2713..a70f9254d98 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -34,6 +34,7 @@ if env['WITH_BF_QUICKTIME']==1: if env['WITH_BF_FFMPEG'] == 1: defs.append('WITH_FFMPEG') + incs += ' ' + env['BF_FFMPEG_INC'] # TODO buildinfo if env['BF_BUILDINFO'] == 1: 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', ''), |