diff options
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 4 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 55e418ec733..9dd39ccd308 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -108,12 +108,14 @@ else: sys.exit(0) 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', @@ -132,5 +134,7 @@ else: scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib))) scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll))) + scons_options.append('BF_BITNESS='+bitness) + retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index fd3ff1fbee7..e779b10bd2a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -72,12 +72,14 @@ 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', @@ -96,6 +98,8 @@ if builder.find('scons') != -1: scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib))) scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll))) + scons_options.append('BF_BITNESS='+bitness) + retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) |