Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- Blender could be build with scons again.

Browse Source
This commit is contained in:
Jiri Hnidek
2011-08-02 07:02:40 +00:00
parent ed306416f5
commit 2e860a3e85
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SConstruct
View File

@@ -241,6 +241,7 @@ if 'blenderlite' in B.targets:
target_env_defs['BF_BUILDINFO'] = False target_env_defs['BF_BUILDINFO'] = False
target_env_defs['BF_NO_ELBEEM'] = True target_env_defs['BF_NO_ELBEEM'] = True
target_env_defs['WITH_BF_PYTHON'] = False target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
# Merge blenderlite, let command line to override # Merge blenderlite, let command line to override
for k,v in target_env_defs.iteritems(): for k,v in target_env_defs.iteritems():

4
build_files/scons/tools/btools.py
View File

@@ -136,7 +136,7 @@ def validate_arguments(args, bc):
'BF_NO_ELBEEM', 'BF_NO_ELBEEM',
'WITH_BF_CXX_GUARDEDALLOC', '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', '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 # 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_PLAYER', 'Build blenderplayer if true', False)),
(BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender 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', []), ('CFLAGS', 'C only flags', []),
('CCFLAGS', 'Generic C and C++ flags', []), ('CCFLAGS', 'Generic C and C++ flags', []),
('CXXFLAGS', 'C++ only flags', []), ('CXXFLAGS', 'C++ only flags', []),

6
intern/ghost/intern/GHOST_NDOFManager.cpp
View File

@@ -185,10 +185,10 @@ GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System& sys)
memset(m_translation, 0, sizeof(m_translation)); memset(m_translation, 0, sizeof(m_translation));
memset(m_rotation, 0, sizeof(m_rotation)); memset(m_rotation, 0, sizeof(m_rotation));
#ifdef WITH_BF_3DMOUSE #ifdef WITH_INPUT_NDOF
puts("WITH_BF_3DMOUSE is defined!"); puts("WITH_INPUT_NDOF is defined!");
#else #else
puts("WITH_BF_3DMOUSE is not defined."); puts("WITH_INPUT_NDOF is not defined.");
#endif #endif
} }