From 745fc2f9d045508c4c822266dbe3a90274b3ec73 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <blender@erwincoumans.com>
Date: Sun, 23 Oct 2005 17:55:19 +0000
Subject: 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!
---
 extern/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extern')

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
 
-- 
cgit v1.2.3