We don't use ODE anymore, so I commented out some lines that make it
authorChris Want <cwant@ualberta.ca>
Thu, 26 Aug 2004 22:42:44 +0000 (22:42 +0000)
committerChris Want <cwant@ualberta.ca>
Thu, 26 Aug 2004 22:42:44 +0000 (22:42 +0000)
required to build.

source/Makefile
source/gameengine/Physics/Makefile
source/nan_link.mk

index c4e8140818a0749886e8340e7e41904e37516d77..80dda10d982f1da7c70b43235d5a11af73637284 100644 (file)
@@ -122,7 +122,7 @@ ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/ketsji/$(DEBUG_DIR)libketsji.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
-    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
+#    COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a
 #    COMLIB += $(OCGDIR)/gameengine/blphys/sumo/$(DEBUG_DIR)libsumo.a
     COMLIB += $(OCGDIR)/gameengine/blphys/dummy/$(DEBUG_DIR)libdummy.a
     COMLIB += $(OCGDIR)/gameengine/blphys/common/$(DEBUG_DIR)libcommon.a
index 7aee1a01cd1c779acfd0ccf01140f46375bc2b79..a921848cfa7f0522368fb50352f2bc773af49fc8 100644 (file)
@@ -36,6 +36,6 @@ include nan_definitions.mk
 SOURCEDIR = source/gameengine/Physics
 DIR = $(OCGDIR)/gameengine/blphys
 DIRS = common Sumo Dummy
-DIRS += BlOde
+#DIRS += BlOde
 
 include nan_subdirs.mk
index d9fb9cb70a3764ccccf1be33b6764262a6858666..8316111c89e36d44b040f89fabf6c8647dec9d5b 100644 (file)
@@ -97,7 +97,7 @@ ifeq ($(OS),linux)
     COMMENT = "MESA 3.1"
     LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread
-    LLIBS += -L$(NAN_ODE)/lib -lode
+#    LLIBS += -L$(NAN_ODE)/lib -lode
     LOPTS = -export-dynamic
     DADD = -lGL -lGLU
     SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a