diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2005-10-23 21:55:19 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2005-10-23 21:55:19 +0400 |
| commit | 745fc2f9d045508c4c822266dbe3a90274b3ec73 (patch) | |
| tree | 7578e1fb20d3fcab16594ca1c519997ee5c21b67 /extern | |
| parent | 6ce7d18371f8d2d1319082ed3cef553de339a65c (diff) | |
updated SConstruct and Makefile so that if you compile the gameengine, is always enables bullet, independent of sumo/ode.
So for the 2.4 release, both bullet AND sumo will be enabled. You can choose in the world buttons which physics engine is active for a scene.
sorry if this breaks your builds!
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/Makefile b/extern/Makefile index 0a85b9b5220..53abb0b1b3c 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -40,7 +40,7 @@ ifeq ($(WITH_FREETYPE2), true) DIRS += bFTGL/src endif -ifeq ($(NAN_USE_BULLET), true) +ifneq ($(NAN_NO_KETSJI), true) DIRS += bullet endif |