From 957832ecf1229dc7648164fa9585feb885b48469 Mon Sep 17 00:00:00 2001 From: Chris Want Date: Tue, 21 Feb 2006 20:45:20 +0000 Subject: [PATCH] Trying to get the bullet re-org to work with Makefiles. --- extern/bullet/Bullet/Makefile | 3 ++- extern/bullet/BulletDynamics/Makefile | 4 ++-- extern/bullet/Makefile | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/extern/bullet/Bullet/Makefile b/extern/bullet/Bullet/Makefile index eb3710dc691..6c1b4bee26e 100644 --- a/extern/bullet/Bullet/Makefile +++ b/extern/bullet/Bullet/Makefile @@ -38,6 +38,7 @@ DIR = $(OCGDIR)/$(SOURCEDIR) CCSRCS = $(wildcard BroadphaseCollision/*.cpp) CCSRCS += $(wildcard NarrowPhaseCollision/*.cpp) CCSRCS += $(wildcard CollisionShapes/*.cpp) +CCSRCS += $(wildcard CollisionDispatch/*.cpp) CPPFLAGS += -DUSE_DOUBLES -DQHULL -D_LIB CPPFLAGS += -I../Bullet -I../BulletDynamics -I../LinearMath @@ -52,4 +53,4 @@ objdirs: @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)BroadphaseCollision @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)NarrowPhaseCollision @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)CollisionShapes - + @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)CollisionDispatch diff --git a/extern/bullet/BulletDynamics/Makefile b/extern/bullet/BulletDynamics/Makefile index 3d3f9d0714f..2d95f1fdd4b 100644 --- a/extern/bullet/BulletDynamics/Makefile +++ b/extern/bullet/BulletDynamics/Makefile @@ -35,7 +35,7 @@ LIBNAME = bulletdyn SOURCEDIR = extern/bullet/BulletDynamics DIR = $(OCGDIR)/$(SOURCEDIR) -CCSRCS = $(wildcard CollisionDispatch/*.cpp) +CCSRCS = $(wildcard Vehicle/*.cpp) CCSRCS += $(wildcard ConstraintSolver/*.cpp) CCSRCS += $(wildcard Dynamics/*.cpp) @@ -49,7 +49,7 @@ include nan_compile.mk .PHONY: objdirs objdirs: @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR) - @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)CollisionDispatch + @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)Vehicle @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)ConstraintSolver @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)Dynamics diff --git a/extern/bullet/Makefile b/extern/bullet/Makefile index 336c58cab82..793a9606e8c 100755 --- a/extern/bullet/Makefile +++ b/extern/bullet/Makefile @@ -50,6 +50,7 @@ install: all debug @[ -d $(NAN_BULLET)/include/Dynamics ] || mkdir $(NAN_BULLET)/include/Dynamics @[ -d $(NAN_BULLET)/include/ConstraintSolver ] || mkdir $(NAN_BULLET)/include/ConstraintSolver @[ -d $(NAN_BULLET)/include/CollisionDispatch ] || mkdir $(NAN_BULLET)/include/CollisionDispatch + @[ -d $(NAN_BULLET)/include/Vehicle ] || mkdir $(NAN_BULLET)/include/Vehicle @[ -d $(NAN_BULLET)/lib ] || mkdir $(NAN_BULLET)/lib @[ -d $(NAN_BULLET)/lib/debug ] || mkdir $(NAN_BULLET)/lib/debug @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/Bullet/libbullet.a $(NAN_BULLET)/lib/ @@ -65,7 +66,8 @@ endif @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh Bullet/CollisionShapes/*.h $(NAN_BULLET)/include/CollisionShapes @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh Bullet/BroadphaseCollision/*.h $(NAN_BULLET)/include/BroadphaseCollision @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh Bullet/NarrowPhaseCollision/*.h $(NAN_BULLET)/include/NarrowPhaseCollision + @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh Bullet/CollisionDispatch/*.h $(NAN_BULLET)/include/CollisionDispatch @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh BulletDynamics/Dynamics/*.h $(NAN_BULLET)/include/Dynamics @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh BulletDynamics/ConstraintSolver/*.h $(NAN_BULLET)/include/ConstraintSolver - @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh BulletDynamics/CollisionDispatch/*.h $(NAN_BULLET)/include/CollisionDispatch + @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh BulletDynamics/Vehicle/*.h $(NAN_BULLET)/include/Vehicle @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh LinearMath/*.h $(NAN_BULLET)/include