[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38984] trunk/blender/build_files/buildbot : Add BF_BITNESS for win32/win64

Nathan Letwory nathan at letworyinteractive.com
Wed Aug 3 14:57:38 CEST 2011


Revision: 38984
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38984
Author:   jesterking
Date:     2011-08-03 12:57:38 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Add BF_BITNESS for win32/win64

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_compile.py
    trunk/blender/build_files/buildbot/slave_pack.py

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2011-08-03 12:44:52 UTC (rev 38983)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2011-08-03 12:57:38 UTC (rev 38984)
@@ -108,12 +108,14 @@
 
         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 @@
             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)

Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py	2011-08-03 12:44:52 UTC (rev 38983)
+++ trunk/blender/build_files/buildbot/slave_pack.py	2011-08-03 12:57:38 UTC (rev 38984)
@@ -72,12 +72,14 @@
         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 @@
             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)
 




More information about the Bf-blender-cvs mailing list