diff options
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
-rw-r--r-- | build_files/buildbot/slave_pack.py | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 5fdeb4a8ad5..af8d99893b4 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -72,31 +72,11 @@ if builder.find('scons') != -1: retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) else: - bitness = '32' - # 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' - bitness = '64' - - all_ffmpeg_libs = ['avcodec-53', - 'avdevice-53', - 'avformat-53', - 'avutil-51', - 'swscale-2'] - - ffmpeg_lib = [] - ffmpeg_dll = [] + bitness = '32' - for lib in all_ffmpeg_libs: - ffmpeg_lib.append(lib + '.lib') - ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll') - - 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))) + if builder.find('win64') != -1: + bitness = '64' scons_options.append('BF_BITNESS=' + bitness) |