Remove BGE defines from highest level and define only there where needed. This preven...
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 11 Nov 2008 22:48:47 +0000 (22:48 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 11 Nov 2008 22:48:47 +0000 (22:48 +0000)
source/blender/src/SConscript
tools/Blender.py

index b95e4f096b127380380c93375d79c44e3dbf0309..2759e8ca7ffc28b01d084e01073e1273c561b068 100644 (file)
@@ -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']
index b192a591aa1de702e7baab4d8055562735aab290..3b5e33eda593854a9996c02e1c1070b783b292c3 100644 (file)
@@ -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'])