Trying to get the bullet re-org to work with Makefiles.

This commit is contained in:
Chris Want 2006-02-21 20:45:20 +00:00
parent ab4bca8db9
commit 957832ecf1
3 changed files with 7 additions and 4 deletions

@ -38,6 +38,7 @@ DIR = $(OCGDIR)/$(SOURCEDIR)
CCSRCS = $(wildcard BroadphaseCollision/*.cpp) CCSRCS = $(wildcard BroadphaseCollision/*.cpp)
CCSRCS += $(wildcard NarrowPhaseCollision/*.cpp) CCSRCS += $(wildcard NarrowPhaseCollision/*.cpp)
CCSRCS += $(wildcard CollisionShapes/*.cpp) CCSRCS += $(wildcard CollisionShapes/*.cpp)
CCSRCS += $(wildcard CollisionDispatch/*.cpp)
CPPFLAGS += -DUSE_DOUBLES -DQHULL -D_LIB CPPFLAGS += -DUSE_DOUBLES -DQHULL -D_LIB
CPPFLAGS += -I../Bullet -I../BulletDynamics -I../LinearMath 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)BroadphaseCollision
@$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)NarrowPhaseCollision @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)NarrowPhaseCollision
@$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)CollisionShapes @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)CollisionShapes
@$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)CollisionDispatch

@ -35,7 +35,7 @@ LIBNAME = bulletdyn
SOURCEDIR = extern/bullet/BulletDynamics SOURCEDIR = extern/bullet/BulletDynamics
DIR = $(OCGDIR)/$(SOURCEDIR) DIR = $(OCGDIR)/$(SOURCEDIR)
CCSRCS = $(wildcard CollisionDispatch/*.cpp) CCSRCS = $(wildcard Vehicle/*.cpp)
CCSRCS += $(wildcard ConstraintSolver/*.cpp) CCSRCS += $(wildcard ConstraintSolver/*.cpp)
CCSRCS += $(wildcard Dynamics/*.cpp) CCSRCS += $(wildcard Dynamics/*.cpp)
@ -49,7 +49,7 @@ include nan_compile.mk
.PHONY: objdirs .PHONY: objdirs
objdirs: objdirs:
@$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR) @$(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)ConstraintSolver
@$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)Dynamics @$(MAKE) makedir DIR=$(DIR)/$(DEBUG_DIR)Dynamics

@ -50,6 +50,7 @@ install: all debug
@[ -d $(NAN_BULLET)/include/Dynamics ] || mkdir $(NAN_BULLET)/include/Dynamics @[ -d $(NAN_BULLET)/include/Dynamics ] || mkdir $(NAN_BULLET)/include/Dynamics
@[ -d $(NAN_BULLET)/include/ConstraintSolver ] || mkdir $(NAN_BULLET)/include/ConstraintSolver @[ -d $(NAN_BULLET)/include/ConstraintSolver ] || mkdir $(NAN_BULLET)/include/ConstraintSolver
@[ -d $(NAN_BULLET)/include/CollisionDispatch ] || mkdir $(NAN_BULLET)/include/CollisionDispatch @[ -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 ] || mkdir $(NAN_BULLET)/lib
@[ -d $(NAN_BULLET)/lib/debug ] || mkdir $(NAN_BULLET)/lib/debug @[ -d $(NAN_BULLET)/lib/debug ] || mkdir $(NAN_BULLET)/lib/debug
@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/Bullet/libbullet.a $(NAN_BULLET)/lib/ @$(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/CollisionShapes/*.h $(NAN_BULLET)/include/CollisionShapes
@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh Bullet/BroadphaseCollision/*.h $(NAN_BULLET)/include/BroadphaseCollision @$(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/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/Dynamics/*.h $(NAN_BULLET)/include/Dynamics
@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh BulletDynamics/ConstraintSolver/*.h $(NAN_BULLET)/include/ConstraintSolver @$(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 @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh LinearMath/*.h $(NAN_BULLET)/include