Step 1 of Bullet 2.x upgrade:
authorErwin Coumans <blender@erwincoumans.com>
Tue, 21 Nov 2006 00:14:58 +0000 (00:14 +0000)
committerErwin Coumans <blender@erwincoumans.com>
Tue, 21 Nov 2006 00:14:58 +0000 (00:14 +0000)
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.

config/darwin-config.py
config/linux2-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-vc-config.py
source/nan_definitions.mk

index 08fdbb41baa4fada26c03f06d700df23b7cdad30..c2b68b12f838401d94ea3634328619450cbda80a 100644 (file)
@@ -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'
index c56a3d1d8f7515b1b327539b8eaeda431fbfae8b..4d2b9e9ca3a23026fcdee5107a522f291d0c050a 100644 (file)
@@ -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'
index 303f79c9bc8a233558dc4ade17120e93f67f0a6c..50a77dccc4d59b99b675e2dcfd01bf902ae3f2e3 100644 (file)
@@ -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'
index 71f1e7a1b4876b47ac3f172693e84ae2d57ddd16..4441d3c9a510ac4d80e58c0b661e67e551d17919 100644 (file)
@@ -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'
index cccd7f24009c98a94105b764e9017a354a9432cf..63964a3c5ed68b0b87d449f59934e1af6a915451 100644 (file)
@@ -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'
index a75c913ab93e7c7fc65b7a3ed7a8ae0a40212894..ac2bf7b6b762f6bb22fec6ba92c26bd604885450 100644 (file)
@@ -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)))