From 9776749438661c0476618d81918c15bd41347fc9 Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Wed, 17 Dec 2008 00:41:07 +0000 Subject: Reverting revision 17417 which broke cloth collisions which check also in blenkernel/intern for WITH_BULLET --- source/blender/src/SConscript | 3 --- tools/Blender.py | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 451afc9b244..dedb40485ef 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -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'] diff --git a/tools/Blender.py b/tools/Blender.py index 1c54e98f177..3bf6f01bc25 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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']) -- cgit v1.2.3