forked from bartvdbraak/blender
Step 1 of Bullet 2.x upgrade:
Temporarily disabled game engine for scons and Makefiles (nan_definitions?), this to upgrade to Bullet 2.x scons for Darwin, Linux, BSD3, SunOS5, Win32, and Makefiles should not compile game engine right now. CMake and MSVC needs still disabling of game engine.
This commit is contained in:
parent
d58670ddd2
commit
3b91d4e30a
@ -65,8 +65,8 @@ BF_FTGL = '#extern/bFTGL'
|
||||
BF_FTGL_INC = '${BF_FTGL}/include'
|
||||
BF_FTGL_LIB = 'extern_ftgl'
|
||||
|
||||
WITH_BF_GAMEENGINE='true'
|
||||
WITH_BF_PLAYER='true'
|
||||
WITH_BF_GAMEENGINE='false'
|
||||
WITH_BF_PLAYER='false'
|
||||
|
||||
WITH_BF_ODE = 'false'
|
||||
BF_ODE = LIBDIR + '/ode'
|
||||
|
@ -59,7 +59,7 @@ BF_FTGL = '#extern/bFTGL'
|
||||
BF_FTGL_INC = '${BF_FTGL}/include'
|
||||
BF_FTGL_LIB = 'extern_ftgl'
|
||||
|
||||
WITH_BF_GAMEENGINE='true'
|
||||
WITH_BF_GAMEENGINE='false'
|
||||
|
||||
WITH_BF_ODE = 'false'
|
||||
BF_ODE = LIBDIR + '/ode'
|
||||
|
@ -60,7 +60,7 @@ BF_FTGL = '#extern/bFTGL'
|
||||
BF_FTGL_INC = '${BF_FTGL}/include'
|
||||
BF_FTGL_LIB = 'extern_ftgl'
|
||||
|
||||
WITH_BF_GAMEENGINE='true'
|
||||
WITH_BF_GAMEENGINE='false'
|
||||
|
||||
WITH_BF_ODE = 'false'
|
||||
BF_ODE = LIBDIR + '/ode'
|
||||
|
@ -62,7 +62,7 @@ BF_FTGL = '#extern/bFTGL'
|
||||
BF_FTGL_INC = '${BF_FTGL}/include'
|
||||
BF_FTGL_LIB = 'extern_ftgl'
|
||||
|
||||
WITH_BF_GAMEENGINE='true'
|
||||
WITH_BF_GAMEENGINE='false'
|
||||
|
||||
WITH_BF_ODE = 'false'
|
||||
BF_ODE = LIBDIR + '/ode'
|
||||
|
@ -83,7 +83,7 @@ BF_FTGL = LIBDIR + '/ftgl'
|
||||
BF_FTGL_INC = '${BF_FTGL}/include'
|
||||
BF_FTGL_LIB = 'extern_ftgl'
|
||||
|
||||
WITH_BF_GAMEENGINE = 'true'
|
||||
WITH_BF_GAMEENGINE = 'false'
|
||||
|
||||
WITH_BF_ODE = 'true'
|
||||
BF_ODE = LIBDIR + '/ode'
|
||||
|
@ -34,6 +34,9 @@
|
||||
|
||||
sinclude ../user-def.mk
|
||||
|
||||
#game engine temporarily disabled: need to upgrade to Bullet 2.x
|
||||
export NAN_NO_KETSJI=true
|
||||
|
||||
ifndef CONFIG_GUESS
|
||||
ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
|
||||
ifeq (all, $(findstring all, $(MAKECMDGOALS)))
|
||||
|
Loading…
Reference in New Issue
Block a user