* changes to work with updated FFMPEG libs. Mainly build system. CMake files may...
authorNathan Letwory <nathan@letworyinteractive.com>
Mon, 24 Aug 2009 02:49:57 +0000 (02:49 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Mon, 24 Aug 2009 02:49:57 +0000 (02:49 +0000)
NOTE: remember to svn up in lib/windows!

SConstruct
config/win32-mingw-config.py
config/win32-vc-config.py
source/blender/src/header_info.c

index a5c70f403664049ede8ae69fca31a3752e916dfc..4ce3aa25d112c553d59fbfcb54f19f0fe9c0bf28 100644 (file)
@@ -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
index 5801df86c2795e3557b11528afb64897b4935f87..f7130cb4ac33e0effd7e5b0dd35cbda699b9149e 100644 (file)
@@ -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'
index 359f52e6bf836461882bb37163bb4d1f324152b7..3ec76d464bcaec5e671b784d1964732edd50c259 100644 (file)
@@ -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'
 
index 65baa4df830b19793b0e177e705a10a998c155a7..4b560139b0f4ceef8776255acd9761d006f1db73 100644 (file)
@@ -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];