[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38953] trunk/blender: Simple argument to be able to explicitely tell the bitness you want to build Blender in .

[Nathan Letwory]

Revision: 38953
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38953
Author:   jesterking
Date:     2011-08-02 18:33:39 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Simple argument to be able to explicitely tell the bitness you want to build Blender in.

python scons\scons.py BF_BITNESS=32
python scons\scons.py BF_BITNESS=64

So from now on for Windows you don't have to run a specific win32 or win64 Python version
to get the Blender version you want. If you omit the BF_BITNESS flag the bitness as per
Python version will be used as before.

Note that this is an argument, so works *only* on the command-line, not in your user-config.py

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-08-02 18:29:42 UTC (rev 38952)
+++ trunk/blender/SConstruct	2011-08-02 18:33:39 UTC (rev 38953)
@@ -111,6 +111,11 @@
 
 # handling cmd line arguments & config file
 
+# bitness stuff
+tempbitness = int(B.arguments.get('BF_BITNESS', bitness)) # default to bitness found as per starting python
+if tempbitness in (32, 64): # only set if 32 or 64 has been given
+    bitness = int(tempbitness)
+
 # first check cmdline for toolset and we create env to work on
 quickie = B.arguments.get('BF_QUICK', None)
 quickdebug = B.arguments.get('BF_QUICKDEBUG', None)

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2011-08-02 18:29:42 UTC (rev 38952)
+++ trunk/blender/build_files/scons/tools/btools.py	2011-08-02 18:33:39 UTC (rev 38953)
@@ -159,7 +159,7 @@
             'BF_BSC', 'BF_CONFIG',
             'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
             'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG',
-            'BF_UNIT_TEST']
+            'BF_UNIT_TEST', 'BF_BITNESS']
 
     okdict = {}