* commit r17900 by Genscher was wrong.
authorNathan Letwory <nathan@letworyinteractive.com>
Wed, 17 Dec 2008 05:40:40 +0000 (05:40 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Wed, 17 Dec 2008 05:40:40 +0000 (05:40 +0000)
  - 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.

source/blender/blenkernel/SConscript
source/blender/src/SConscript
tools/Blender.py

index ab122e40bfc06de55e6fb32cdc9cdf4f6c969680..4ab7d4a679250239b10f82db5cb2213895826128 100644 (file)
@@ -53,6 +53,9 @@ if env['WITH_BF_QUICKTIME']:
     defs += ' WITH_QUICKTIME'
     incs += ' ' + env['BF_QUICKTIME_INC']
 
+if env['WITH_BF_BULLET']:
+    defs += ' WITH_BULLET'
+
 if env['BF_NO_ELBEEM']:
     defs += ' DISABLE_ELBEEM'
 
index dedb40485ef3278a50dde804174b0ed7da811966..451afc9b244118a0213df7c8902c40594c57b162 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 3bf6f01bc2532e599ebc31a06b7311cba2bfa0f8..1c54e98f1776c9c7c696f5fbadca139ed6f873ff 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'])