[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22592] branches/blender2.5/blender/source : forgot to updated scons and make for the bullet defines
Campbell Barton
ideasman42 at gmail.com
Tue Aug 18 06:15:29 CEST 2009
Revision: 22592
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22592
Author: campbellbarton
Date: 2009-08-18 06:15:28 +0200 (Tue, 18 Aug 2009)
Log Message:
-----------
forgot to updated scons and make for the bullet defines
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/nan_compile.mk
Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-08-18 03:24:46 UTC (rev 22591)
+++ branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-08-18 04:15:28 UTC (rev 22592)
@@ -52,7 +52,7 @@
incs += ' ' + env['BF_QUICKTIME_INC']
if env['WITH_BF_BULLET']:
- defs.append('WITH_BULLET')
+ defs.append('USE_BULLET')
if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM')
Modified: branches/blender2.5/blender/source/nan_compile.mk
===================================================================
--- branches/blender2.5/blender/source/nan_compile.mk 2009-08-18 03:24:46 UTC (rev 22591)
+++ branches/blender2.5/blender/source/nan_compile.mk 2009-08-18 04:15:28 UTC (rev 22592)
@@ -40,8 +40,8 @@
ifneq ($(NAN_NO_KETSJI), true)
CFLAGS += -DGAMEBLENDER=1
ifeq ($(NAN_USE_BULLET), true)
- CFLAGS += -DUSE_BULLET -DWITH_BULLET
- CCFLAGS += -DUSE_BULLET -DWITH_BULLET
+ CFLAGS += -DUSE_BULLET
+ CCFLAGS += -DUSE_BULLET
endif
else
CPPFLAGS += -DNO_KETSJI
More information about the Bf-blender-cvs
mailing list