Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorChris Want <cwant@ualberta.ca>2004-08-27 02:42:44 +0400
committerChris Want <cwant@ualberta.ca>2004-08-27 02:42:44 +0400
commit95b9534d2bc9a6d79134eba9c82bb5f398f09113 (patch)
treee154b43ae5b1f37a2cb1db479e350761ef0630ef /source
parentbd768e00f3b268f0a3ce66ecb0ac7dcf1a860cf5 (diff)
We don't use ODE anymore, so I commented out some lines that make it
required to build.
Diffstat (limited to 'source')
-rw-r--r--source/Makefile2
-rw-r--r--source/gameengine/Physics/Makefile2
-rw-r--r--source/nan_link.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/source/Makefile b/source/Makefile
index c4e8140818a..80dda10d982 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -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
diff --git a/source/gameengine/Physics/Makefile b/source/gameengine/Physics/Makefile
index 7aee1a01cd1..a921848cfa7 100644
--- a/source/gameengine/Physics/Makefile
+++ b/source/gameengine/Physics/Makefile
@@ -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
diff --git a/source/nan_link.mk b/source/nan_link.mk
index d9fb9cb70a3..8316111c89e 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -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