diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-24 06:49:57 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-24 06:49:57 +0400 |
| commit | 5e9e6df2a24b28cbb8c1de293725ebe4af3f9a2d (patch) | |
| tree | c604f9889fcb0faaa1f03fd94d3ecfd522775419 | |
| parent | 4a4a3b4989355c699b72a8dc15df09fd47621528 (diff) | |
* changes to work with updated FFMPEG libs. Mainly build system. CMake files may need changing too.
NOTE: remember to svn up in lib/windows!
| -rw-r--r-- | SConstruct | 10 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 8 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 2 | ||||
| -rw-r--r-- | source/blender/src/header_info.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index a5c70f40366..4ce3aa25d11 100644 --- a/SConstruct +++ b/SConstruct @@ -570,11 +570,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): '${LCGDIR}/ffmpeg/lib/avformat-52.dll', '${LCGDIR}/ffmpeg/lib/avdevice-52.dll', '${LCGDIR}/ffmpeg/lib/avutil-50.dll', - '${LCGDIR}/ffmpeg/lib/libfaad-2.dll', - '${LCGDIR}/ffmpeg/lib/libfaac-0.dll', - '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', - '${LCGDIR}/ffmpeg/lib/libx264-67.dll', - '${LCGDIR}/ffmpeg/lib/xvidcore.dll', +# '${LCGDIR}/ffmpeg/lib/libfaad-2.dll', +# '${LCGDIR}/ffmpeg/lib/libfaac-0.dll', +# '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', +# '${LCGDIR}/ffmpeg/lib/libx264-67.dll', +# '${LCGDIR}/ffmpeg/lib/xvidcore.dll', '${LCGDIR}/ffmpeg/lib/swscale-0.dll'] windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) allinstall += windlls diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 5801df86c27..f7130cb4ac3 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -26,10 +26,10 @@ BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -WITH_BF_FFMPEG = False -BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264' -BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' -BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' +WITH_BF_FFMPEG = True +BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0' +BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib' +BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include' WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 359f52e6bf8..3ec76d464bc 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -7,7 +7,7 @@ BF_VERSE_INCLUDE = "#extern/verse/dist" # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' -BF_FFMPEG_INC = '${BF_FFMPEG}/include' +BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib' diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 65baa4df830..4b560139b0f 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -565,8 +565,8 @@ static void copy_game_dll(char *dll_filename, char *source_dir, char *dest_dir) static void copy_all_game_dlls(char *str) { -#define GAME_DLL_COUNT 17 - char *game_dll_list[GAME_DLL_COUNT]={"avcodec-52.dll", "avdevice-52.dll", "avformat-52.dll", "avutil-50.dll", "libfaac-0.dll", "libfaad-2.dll", "libmp3lame-0.dll", "libx264-67.dll", "swscale-0.dll", "xvidcore.dll", "gnu_gettext.dll", "libtiff.dll", "python26.dll", "SDL.dll", "pthreadVC2.dll", "libpng.dll", "zlib.dll"}; +#define GAME_DLL_COUNT 12 + char *game_dll_list[GAME_DLL_COUNT]={"avcodec-52.dll", "avdevice-52.dll", "avformat-52.dll", "avutil-50.dll", "swscale-0.dll", "gnu_gettext.dll", "libtiff.dll", "python26.dll", "SDL.dll", "pthreadVC2.dll", "libpng.dll", "zlib.dll"}; char dest_dir[FILE_MAX]; char source_dir[FILE_MAX]; |