Makefile support for solid -- assumes solid and qhull are in the lib
authorChris Want <cwant@ualberta.ca>
Sun, 28 Mar 2004 21:56:00 +0000 (21:56 +0000)
committerChris Want <cwant@ualberta.ca>
Sun, 28 Mar 2004 21:56:00 +0000 (21:56 +0000)
dir, i.e., ../lib/your_platform/{solid|qhull}.

source/Makefile
source/nan_compile.mk
source/nan_definitions.mk

index e163ceb023c97b8bb5fb83a04e7ae3fdcffe3e66..7f972a054560c681bbcefa3639ebd6334e227e56 100644 (file)
@@ -106,10 +106,12 @@ ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
     COMLIB += $(OCGDIR)/gameengine/blconverter/$(DEBUG_DIR)libblconverter.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
-    COMLIB += $(NAN_ODE)/lib/libode.a
-#    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
+    COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
+    COMLIB += $(NAN_SOLID)/lib/libsolid.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
+    COMLIB += $(OCGDIR)/gameengine/blphys/fuzzics/$(DEBUG_DIR)libfuzzics.a
+    COMLIB += $(NAN_QHULL)/lib/libqhull.a
+   COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
 #    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
index 7b0770a15c8a66046663062b29a0f14c5ac95a34..46128db3b3b0d960b75afc8547f3e487ac607478 100644 (file)
@@ -38,7 +38,9 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 # common parts ---------------------------------------------------
 
 # Uncomment next line to enable integrated game engine
-#CFLAGS += -DGAMEBLENDER=1
+CFLAGS  += -DGAMEBLENDER=1
+CFLAGS  += -DUSE_SUMO_SOLID
+CCFLAGS += -DUSE_SUMO_SOLID
 
 ifdef NAN_DEBUG
     CFLAGS += $(NAN_DEBUG)
index 9d648c6d78af40378eae2134edc0951938d686c3..aa6dbadf983e474771e398fa645e27bbc33ee579 100644 (file)
@@ -58,7 +58,13 @@ all debug::
     # Object Config_Guess DIRectory
     export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
     export NAN_MOTO ?= $(LCGDIR)/moto
-    export NAN_SOLID ?= $(SRCHOME)/sumo/SOLID-3.0
+ifeq ($(FREE_WINDOWS), true)
+    export NAN_SOLID ?= $(LCGDIR)/gcc/solid
+    export NAN_QHULL ?= $(LCGDIR)/gcc/qhull
+else
+    export NAN_SOLID ?= $(LCGDIR)/solid
+    export NAN_QHULL ?= $(LCGDIR)/qhull
+endif
     export NAN_SUMO ?= $(SRCHOME)/gameengine/Physics/Sumo
     export NAN_FUZZICS ?= $(SRCHOME)/gameengine/Physics/Sumo/Fuzzics
     export NAN_BLENKEY ?= $(LCGDIR)/blenkey