- Blender could be build with scons again.
authorJiri Hnidek <jiri.hnidek@tul.cz>
Tue, 2 Aug 2011 07:02:40 +0000 (07:02 +0000)
committerJiri Hnidek <jiri.hnidek@tul.cz>
Tue, 2 Aug 2011 07:02:40 +0000 (07:02 +0000)
SConstruct
build_files/scons/tools/btools.py
intern/ghost/intern/GHOST_NDOFManager.cpp

index 053f414c954dcb8cc545c5a9f12781dde5519e68..e27f8eae3672ed39c71e16de5a648ba33cb454e9 100644 (file)
@@ -241,6 +241,7 @@ if 'blenderlite' in B.targets:
     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():
index 677ddab8db5c4f7c01bb1359c67dbd715d9d9b25..a96bf8ce4cca25db5c4e8c5a0e5143e107b73618 100644 (file)
@@ -136,7 +136,7 @@ def validate_arguments(args, bc):
             '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 @@ def read_opts(env, cfg, args):
         (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', []),
index 4694afaf24f6d5cc19082e172a5bb1c2c3791c1d..72b0dba297aea975a214bbdb22e41774b8726683 100644 (file)
@@ -185,10 +185,10 @@ GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System& sys)
        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
        }