Revision: 38981
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38981
Author: nazgul
Date: 2011-08-03 11:47:03 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Switch slave_pack to use new FFmpeg for windows.
Modified Paths:
--------------
trunk/blender/build_files/buildbot/slave_pack.py
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-08-03 11:10:19 UTC
(rev 38980)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-08-03 11:47:03 UTC
(rev 38981)
@@ -72,6 +72,30 @@
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
else:
+ # Switch to new FFmpeg library
+ if builder.find('win') != -1:
+ if builder.find('win32') != -1:
+ LCGDIR = '#../lib/windows'
+ elif builder.find('win64') != -1:
+ LCGDIR = '#../lib/win64'
+
+ all_ffmpeg_libs = ['avcodec-53',
+ 'avdevice-53',
+ 'avformat-53',
+ 'avutil-51',
+ 'swscale-2']
+
+ ffmpeg_lib = []
+ ffmpeg_dll = []
+
+ for lib in all_ffmpeg_libs:
+ ffmpeg_lib.append(lib + '.lib')
+ ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.lib')
+
+ scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8')
+ scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
+ scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
+
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
