diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
| commit | b3c238e8bc4c38a8f2ba483be2d19c76d03d674c (patch) | |
| tree | a86991622fa5582498612cf348d0de58af048a08 /tools/Blender.py | |
| parent | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (diff) | |
| parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) | |
2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
Diffstat (limited to 'tools/Blender.py')
| -rw-r--r-- | tools/Blender.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index b192a591aa1..3b5e33eda59 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -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']) |