[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17901] trunk/blender: * commit r17900 by Genscher was wrong.

[Nathan Letwory]

Revision: 17901
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17901
Author:   jesterking
Date:     2008-12-17 06:40:40 +0100 (Wed, 17 Dec 2008)

Log Message:
-----------
* commit r17900 by Genscher was wrong.
  - Instead of defining such defines for the entire codebase in Blender.py, add
    the right checks and definitions to the places where it matters.
  - Only check+set WITH_BULLET instead of also GAMEBLENDER=1
  - NOTE: No global defines allowed in BlenderLib.

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

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2008-12-17 00:41:07 UTC (rev 17900)
+++ trunk/blender/source/blender/blenkernel/SConscript	2008-12-17 05:40:40 UTC (rev 17901)
@@ -53,6 +53,9 @@
     defs += ' WITH_QUICKTIME'
     incs += ' ' + env['BF_QUICKTIME_INC']
 
+if env['WITH_BF_BULLET']:
+    defs += ' WITH_BULLET'
+
 if env['BF_NO_ELBEEM']:
     defs += ' DISABLE_ELBEEM'
 

Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript	2008-12-17 00:41:07 UTC (rev 17900)
+++ trunk/blender/source/blender/src/SConscript	2008-12-17 05:40:40 UTC (rev 17901)
@@ -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-12-17 00:41:07 UTC (rev 17900)
+++ trunk/blender/tools/Blender.py	2008-12-17 05:40:40 UTC (rev 17901)
@@ -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'])