[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22735] branches/blender2.5/blender: * merge r22734 from trunk

[Nathan Letwory]

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

Log Message:
-----------
* merge r22734 from trunk

NOTE: Remember to svn up your lib/windows. Also, CMake files might need updating still

Modified Paths:
--------------
    branches/blender2.5/blender/SConstruct
    branches/blender2.5/blender/config/win32-mingw-config.py
    branches/blender2.5/blender/config/win32-vc-config.py

Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct	2009-08-24 02:49:57 UTC (rev 22734)
+++ branches/blender2.5/blender/SConstruct	2009-08-24 02:51:59 UTC (rev 22735)
@@ -580,11 +580,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']
 	if env['WITH_BF_JACK']:
 		dllsources += ['${LCGDIR}/jack/lib/libjack.dll']

Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py	2009-08-24 02:49:57 UTC (rev 22734)
+++ branches/blender2.5/blender/config/win32-mingw-config.py	2009-08-24 02:51:59 UTC (rev 22735)
@@ -22,9 +22,9 @@
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 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'
+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'
 
 BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'

Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py	2009-08-24 02:49:57 UTC (rev 22734)
+++ branches/blender2.5/blender/config/win32-vc-config.py	2009-08-24 02:51:59 UTC (rev 22735)
@@ -4,7 +4,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'