[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22734] trunk/blender: * changes to work with updated FFMPEG libs.

[Nathan Letwory]

Revision: 22734
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22734
Author:   jesterking
Date:     2009-08-24 04:49:57 +0200 (Mon, 24 Aug 2009)

Log Message:
-----------
* changes to work with updated FFMPEG libs. Mainly build system. CMake files may need changing too.

NOTE: remember to svn up in lib/windows!

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/config/win32-vc-config.py
    trunk/blender/source/blender/src/header_info.c

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2009-08-24 02:46:13 UTC (rev 22733)
+++ trunk/blender/SConstruct	2009-08-24 02:49:57 UTC (rev 22734)
@@ -570,11 +570,11 @@
 						'${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

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2009-08-24 02:46:13 UTC (rev 22733)
+++ trunk/blender/config/win32-mingw-config.py	2009-08-24 02:49:57 UTC (rev 22734)
@@ -26,10 +26,10 @@
 # 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'

Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py	2009-08-24 02:46:13 UTC (rev 22733)
+++ trunk/blender/config/win32-vc-config.py	2009-08-24 02:49:57 UTC (rev 22734)
@@ -7,7 +7,7 @@
 # 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'
 

Modified: trunk/blender/source/blender/src/header_info.c
===================================================================
--- trunk/blender/source/blender/src/header_info.c	2009-08-24 02:46:13 UTC (rev 22733)
+++ trunk/blender/source/blender/src/header_info.c	2009-08-24 02:49:57 UTC (rev 22734)
@@ -565,8 +565,8 @@
 
 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];