Switch slave_pack to use new FFmpeg for windows.
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 3 Aug 2011 11:47:03 +0000 (11:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 3 Aug 2011 11:47:03 +0000 (11:47 +0000)
build_files/buildbot/slave_pack.py

index 4c19b723fc8635061ab12d6bf0c71bb2cedecab4..3a3fffc02b40cfe4d6592d05c08d6357f420cc5b 100644 (file)
@@ -72,6 +72,30 @@ if builder.find('scons') != -1:
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)
     else:
         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)
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)