diff options
| author | Jiri Hnidek <jiri.hnidek@tul.cz> | 2011-08-02 11:02:40 +0400 |
|---|---|---|
| committer | Jiri Hnidek <jiri.hnidek@tul.cz> | 2011-08-02 11:02:40 +0400 |
| commit | 2e860a3e85d1f1045d15b525e3a88d3e8fbb6adf (patch) | |
| tree | 426c0471dab0951c4ecff04d70866f628f9b97d4 | |
| parent | ed306416f5db7516be502b69b677e90a332c3b91 (diff) | |
- Blender could be build with scons again.
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_NDOFManager.cpp | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 053f414c954..e27f8eae367 100644 --- a/SConstruct +++ b/SConstruct @@ -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(): diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 677ddab8db5..a96bf8ce4cc 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -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', []), diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index 4694afaf24f..72b0dba297a 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -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 } |