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/nan_definitions.mk | |
| parent | 7cb76f4bf9395208d632d35c40e058af8aa4a412 (diff) | |
Makefile support for bullet2 ... please test
Diffstat (limited to 'source/nan_definitions.mk')
| -rw-r--r-- | source/nan_definitions.mk | 7 |
1 files changed, 2 insertions, 5 deletions
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... |