[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38915] trunk/blender: - Blender could be build with scons again.

[Jiri Hnidek]

Revision: 38915
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38915
Author:   jiri
Date:     2011-08-02 07:02:40 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
 - Blender could be build with scons again.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/tools/btools.py
    trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-08-02 06:40:40 UTC (rev 38914)
+++ trunk/blender/SConstruct	2011-08-02 07:02:40 UTC (rev 38915)
@@ -241,6 +241,7 @@
     target_env_defs['BF_BUILDINFO'] = False
     target_env_defs['BF_NO_ELBEEM'] = True
     target_env_defs['WITH_BF_PYTHON'] = False
+    target_env_defs['WITH_BF_3DMOUSE'] = False
     
     # Merge blenderlite, let command line to override
     for k,v in target_env_defs.iteritems():

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2011-08-02 06:40:40 UTC (rev 38914)
+++ trunk/blender/build_files/scons/tools/btools.py	2011-08-02 07:02:40 UTC (rev 38915)
@@ -136,7 +136,7 @@
             'BF_NO_ELBEEM',
             'WITH_BF_CXX_GUARDEDALLOC',
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
-            'BUILDBOT_BRANCH'
+            'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE'
             ]
     
     # Have options here that scons expects to be lists
@@ -437,6 +437,8 @@
         (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)),
+
         ('CFLAGS', 'C only flags', []),
         ('CCFLAGS', 'Generic C and C++ flags', []),
         ('CXXFLAGS', 'C++ only flags', []),

Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp	2011-08-02 06:40:40 UTC (rev 38914)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManager.cpp	2011-08-02 07:02:40 UTC (rev 38915)
@@ -185,10 +185,10 @@
 	memset(m_translation, 0, sizeof(m_translation));
 	memset(m_rotation, 0, sizeof(m_rotation));
 
-	#ifdef WITH_BF_3DMOUSE
-	puts("WITH_BF_3DMOUSE is defined!");
+	#ifdef WITH_INPUT_NDOF
+	puts("WITH_INPUT_NDOF is defined!");
 	#else
-	puts("WITH_BF_3DMOUSE is not defined.");
+	puts("WITH_INPUT_NDOF is not defined.");
 	#endif
 	}