[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50221] branches/soc-2012-bratwurst/ build_files/scons/tools/btools.py: Scons:

[Thomas Dinges]

Revision: 50221
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50221
Author:   dingto
Date:     2012-08-26 13:20:41 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Scons:
* Fix scons compilation, by moving some arguments to the second argument list. 

Modified Paths:
--------------
    branches/soc-2012-bratwurst/build_files/scons/tools/btools.py

Modified: branches/soc-2012-bratwurst/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/tools/btools.py	2012-08-26 13:18:43 UTC (rev 50220)
+++ branches/soc-2012-bratwurst/build_files/scons/tools/btools.py	2012-08-26 13:20:41 UTC (rev 50221)
@@ -479,14 +479,6 @@
         (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
         (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
 
-        (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
-        (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
-        ('BF_3DMOUSE', '3d mouse library base path', ''),
-        ('BF_3DMOUSE_INC', '3d mouse library include path', ''),
-        ('BF_3DMOUSE_LIB', '3d mouse library', ''),
-        ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''),
-        ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''),
-
         ('CFLAGS', 'C only flags', []),
         ('CCFLAGS', 'Generic C and C++ flags', []),
         ('CXXFLAGS', 'C++ only flags', []),
@@ -587,6 +579,14 @@
         ('BF_BOOST_LIB', 'Boost library', ''),
         ('BF_BOOST_LIBPATH', 'Boost library path', ''),
         ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
+        
+        (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)),
+        (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)),
+        ('BF_3DMOUSE', '3d mouse library base path', ''),
+        ('BF_3DMOUSE_INC', '3d mouse library include path', ''),
+        ('BF_3DMOUSE_LIB', '3d mouse library', ''),
+        ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''),
+        ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''),
 
         (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)),
         (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', True))