diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-18 08:15:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-18 08:15:28 +0400 |
| commit | 798bed8424c64db8d6ac8e613a37b73eee303ec1 (patch) | |
| tree | 052fa08b94d013a48d9d2e8ec261030492d0112c /source | |
| parent | 0dad5cfbcafeaa45b59b581dc217fe2ebd297f2d (diff) | |
forgot to updated scons and make for the bullet defines
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
| -rw-r--r-- | source/nan_compile.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 6772cccbda6..261d5ee1471 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -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') diff --git a/source/nan_compile.mk b/source/nan_compile.mk index 4a4e472fa66..c62b4f2681b 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -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 |