diff options
author | Chris Want <cwant@ualberta.ca> | 2006-11-22 22:05:35 +0300 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2006-11-22 22:05:35 +0300 |
commit | 341f50c4f78052b4aff135b5493b1421b4ffaf5a (patch) | |
tree | 271adce16008b93b0cc87c5d52de4b4e150390f4 /source | |
parent | 7cb76f4bf9395208d632d35c40e058af8aa4a412 (diff) |
Makefile support for bullet2 ... please test
Diffstat (limited to 'source')
-rw-r--r-- | source/Makefile | 3 | ||||
-rw-r--r-- | source/gameengine/Converter/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Physics/Bullet/Makefile | 2 | ||||
-rw-r--r-- | source/nan_definitions.mk | 7 |
5 files changed, 6 insertions, 10 deletions
diff --git a/source/Makefile b/source/Makefile index 3a15d251df0..5fc3186dd86 100644 --- a/source/Makefile +++ b/source/Makefile @@ -145,8 +145,7 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/ketsji/KXNetwork/$(DEBUG_DIR)libKXNetwork.a COMLIB += $(OCGDIR)/gameengine/Network/$(DEBUG_DIR)libNetwork.a COMLIB += $(OCGDIR)/gameengine/Network/LoopBackNetwork/$(DEBUG_DIR)libLoopBackNetwork.a - COMLIB += $(NAN_BULLET)/lib/libbulletdyn.a - COMLIB += $(NAN_BULLET)/lib/libbullet.a + COMLIB += $(NAN_BULLET2)/lib/libbullet2.a endif COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index 9af6ae12bda..4ba34952d40 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -44,7 +44,7 @@ CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_SOLID)/include -CPPFLAGS += -I$(NAN_BULLET)/include +CPPFLAGS += -I$(NAN_BULLET2)/include CPPFLAGS += -I../../blender # these two needed because of blenkernel diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index ee0b1e42f22..f7813c80a59 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -45,7 +45,7 @@ CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_SOLID)/include -CPPFLAGS += -I$(NAN_BULLET)/include +CPPFLAGS += -I$(NAN_BULLET2)/include CPPFLAGS += -I../Rasterizer/RAS_OpenGLRasterizer CPPFLAGS += -I../Rasterizer -I../GameLogic -I../SceneGraph CPPFLAGS += -I../BlenderRoutines -I../Expressions diff --git a/source/gameengine/Physics/Bullet/Makefile b/source/gameengine/Physics/Bullet/Makefile index 747e750242a..a5643b60c94 100644 --- a/source/gameengine/Physics/Bullet/Makefile +++ b/source/gameengine/Physics/Bullet/Makefile @@ -38,7 +38,7 @@ include nan_compile.mk CCFLAGS += $(LEVEL_1_CPP_WARNINGS) -CPPFLAGS += -I$(NAN_BULLET)/include +CPPFLAGS += -I$(NAN_BULLET2)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../Physics/common CPPFLAGS += -I../../Physics/Dummy diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index ac2bf7b6b76..f2e02fc4c16 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -34,9 +34,6 @@ 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))) @@ -70,7 +67,7 @@ else export NAN_SOLID ?= $(LCGDIR)/solid export NAN_QHULL ?= $(LCGDIR)/qhull endif - export NAN_BULLET ?= $(LCGDIR)/bullet + export NAN_BULLET2 ?= $(LCGDIR)/bullet2 export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo export NAN_FUZZICS ?= $(SRCHOME)/gameengine/Physics/Sumo/Fuzzics export NAN_BLENKEY ?= $(LCGDIR)/blenkey @@ -229,7 +226,7 @@ endif ifeq ($(CPU), i386) export NAN_NO_OPENAL=true endif - + # Uncomment the following line to use Mozilla inplace of netscape # CPPFLAGS +=-DMOZ_NOT_NET # Location of MOZILLA/Netscape header files... |