Add BF_BITNESS for win32/win64
authorNathan Letwory <nathan@letworyinteractive.com>
Wed, 3 Aug 2011 12:57:38 +0000 (12:57 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Wed, 3 Aug 2011 12:57:38 +0000 (12:57 +0000)
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py

index 55e418ec7339146e17c680fd8a29e9eb7b71d53b..9dd39ccd3088b27d8e10fe18477072d5d55cf493 100644 (file)
@@ -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)
index fd3ff1fbee74b794029c2a918c6ebe9ac49a8a6c..e779b10bd2a8272f2f76b7dacfedd31f24438ed8 100644 (file)
@@ -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)