sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

forgot to updated scons and make for the bullet defines

Browse Source
This commit is contained in:
Campbell Barton 2009-08-18 04:15:28 +00:00
parent 0dad5cfbca
commit 798bed8424
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/SConscript
View File

@ -52,7 +52,7 @@ if env['WITH_BF_QUICKTIME']:
incs += ' ' + env['BF_QUICKTIME_INC'] incs += ' ' + env['BF_QUICKTIME_INC']
if env['WITH_BF_BULLET']: if env['WITH_BF_BULLET']:
defs.append('WITH_BULLET') defs.append('USE_BULLET')
if env['BF_NO_ELBEEM']: if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM') defs.append('DISABLE_ELBEEM')

4
source/nan_compile.mk
View File

@ -40,8 +40,8 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
ifneq ($(NAN_NO_KETSJI), true) ifneq ($(NAN_NO_KETSJI), true)
CFLAGS += -DGAMEBLENDER=1 CFLAGS += -DGAMEBLENDER=1
ifeq ($(NAN_USE_BULLET), true) ifeq ($(NAN_USE_BULLET), true)
CFLAGS += -DUSE_BULLET -DWITH_BULLET CFLAGS += -DUSE_BULLET
CCFLAGS += -DUSE_BULLET -DWITH_BULLET CCFLAGS += -DUSE_BULLET
endif endif
else else
CPPFLAGS += -DNO_KETSJI CPPFLAGS += -DNO_KETSJI