forgot to updated scons and make for the bullet defines
authorCampbell Barton <ideasman42@gmail.com>
Tue, 18 Aug 2009 04:15:28 +0000 (04:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 18 Aug 2009 04:15:28 +0000 (04:15 +0000)
source/blender/blenkernel/SConscript
source/nan_compile.mk

index 6772cccbda695404dd9f9efbdd4abebe2d9b6cd1..261d5ee1471823134cd6dcbafadaedd92e763b03 100644 (file)
@@ -52,7 +52,7 @@ if env['WITH_BF_QUICKTIME']:
        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')
index 4a4e472fa66f56a15f46963c1f815c661fcea7a6..c62b4f2681b419dbcd76168261a3c1dba67cdefd 100644 (file)
@@ -40,8 +40,8 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 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