diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-12 01:48:47 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-12 01:48:47 +0300 |
| commit | b8fb31e236bcbc281b060887fefb7af39f143b37 (patch) | |
| tree | d9673f7d9942ea5a2bf6a5263216979a7ff2cd6f | |
| parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) | |
Remove BGE defines from highest level and define only there where needed. This prevents scons from doing complete rebuilds when toggling BGE related options.
| -rw-r--r-- | source/blender/src/SConscript | 3 | ||||
| -rw-r--r-- | tools/Blender.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index b95e4f096b1..2759e8ca7ff 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -65,6 +65,9 @@ if env['WITH_BF_ICONV']: incs += ' ' + env['BF_ICONV_INC'] defs.append('WITH_ICONV') +if env['WITH_BF_GAMEENGINE']: + defs.append('GAMEBLENDER=1') + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] diff --git a/tools/Blender.py b/tools/Blender.py index b192a591aa1..3b5e33eda59 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -421,10 +421,6 @@ class BlenderEnvironment(SConsEnvironment): lenv = self.Clone() lenv.Append(CPPPATH=includes) lenv.Append(CPPDEFINES=defines) - if lenv['WITH_BF_GAMEENGINE']: - lenv.Append(CPPDEFINES=['GAMEBLENDER=1']) - if lenv['WITH_BF_BULLET']: - lenv.Append(CPPDEFINES=['WITH_BULLET=1']) if lenv['BF_DEBUG'] or (libname in quickdebug): lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS']) lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS']) |