diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-08-03 16:57:38 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-08-03 16:57:38 +0400 |
| commit | 36887bbc8205daa96b4ee3844a14ec5543f1f051 (patch) | |
| tree | 179591149ffa77ef8cca1d6c4eb3aeda67c7ca2b /build_files/buildbot/slave_compile.py | |
| parent | aac8bab1729e55f0e77ca43373d44d614f2cb828 (diff) | |
Add BF_BITNESS for win32/win64
Diffstat (limited to 'build_files/buildbot/slave_compile.py')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 4 |
1 files changed, 4 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) |