From 1f668df5141dfcea9bb9e96844734d38c8d7fd54 Mon Sep 17 00:00:00 2001 From: Chris Want Date: Mon, 31 Mar 2003 17:27:20 +0000 Subject: [PATCH] Irix will now link to ode --- source/Makefile | 4 ---- source/gameengine/Physics/Makefile | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/source/Makefile b/source/Makefile index 19d49e16acd..399f7df6639 100644 --- a/source/Makefile +++ b/source/Makefile @@ -100,10 +100,8 @@ PYPLAYERLIB ?= $(PYLIB) 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 -ifneq ($(OS),$(findstring $(OS), "irix")) COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a COMLIB += $(NAN_ODE)/lib/libode.a -endif # 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 @@ -111,9 +109,7 @@ endif 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 -ifneq ($(OS),$(findstring $(OS), "irix")) COMLIB += $(OCGDIR)/gameengine/blphys/blode/$(DEBUG_DIR)libblode.a -endif # 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 245ad8f9308..7aee1a01cd1 100644 --- a/source/gameengine/Physics/Makefile +++ b/source/gameengine/Physics/Makefile @@ -36,8 +36,6 @@ include nan_definitions.mk SOURCEDIR = source/gameengine/Physics DIR = $(OCGDIR)/gameengine/blphys DIRS = common Sumo Dummy -ifneq ($(OS),$(findstring $(OS), "irix")) - DIRS += BlOde -endif +DIRS += BlOde include nan_subdirs.mk