[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17417] trunk/blender: Remove BGE defines from highest level and define only there where needed.

[Nathan Letwory]

Revision: 17417
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17417
Author:   jesterking
Date:     2008-11-11 23:48:47 +0100 (Tue, 11 Nov 2008)

Log Message:
-----------
Remove BGE defines from highest level and define only there where needed. This prevents scons from doing complete rebuilds when toggling BGE related options.

Modified Paths:
--------------
    trunk/blender/source/blender/src/SConscript
    trunk/blender/tools/Blender.py

Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript	2008-11-11 21:37:53 UTC (rev 17416)
+++ trunk/blender/source/blender/src/SConscript	2008-11-11 22:48:47 UTC (rev 17417)
@@ -65,6 +65,9 @@
     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']

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2008-11-11 21:37:53 UTC (rev 17416)
+++ trunk/blender/tools/Blender.py	2008-11-11 22:48:47 UTC (rev 17417)
@@ -421,10 +421,6 @@
 			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'])