Reverting revision 17417 which broke cloth collisions which check also in blenkernel...
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 17 Dec 2008 00:41:07 +0000 (00:41 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 17 Dec 2008 00:41:07 +0000 (00:41 +0000)
source/blender/src/SConscript
tools/Blender.py

index 451afc9b244118a0213df7c8902c40594c57b162..dedb40485ef3278a50dde804174b0ed7da811966 100644 (file)
@@ -65,9 +65,6 @@ 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 1c54e98f1776c9c7c696f5fbadca139ed6f873ff..3bf6f01bc2532e599ebc31a06b7311cba2bfa0f8 100644 (file)
@@ -421,6 +421,10 @@ 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'])