From dbb49fd37853abe07bd09a70465e6098f36ecaf6 Mon Sep 17 00:00:00 2001
From: Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org>
Date: Tue, 25 Mar 2003 14:39:19 +0000
Subject: - Build ode on OSX - shuffle patching around

---
 extern/ode/Makefile | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'extern/ode')

diff --git a/extern/ode/Makefile b/extern/ode/Makefile
index 1479dfcfc32..110880bd7cd 100644
--- a/extern/ode/Makefile
+++ b/extern/ode/Makefile
@@ -37,28 +37,33 @@ USERSETTINGS = ./dist/config/user-settings
 TEMPSETTINGS = ./user-settings
 
 all:
+	[ -d $(DISTDIR)/lib ] || mkdir $(DISTDIR)/lib
+	# prepare settings for patching, clean in case of interruption
+	[ ! -f $(TEMPSETTINGS) ] || mv $(TEMPSETTINGS) $(USERSETTINGS) 
+	mv $(USERSETTINGS) $(TEMPSETTINGS)
     ifeq ($(OS),freebsd)
 	(grep FreeBSD $(DISTDIR)/Makefile >/dev/null ; \
 	    [ $$? -eq 0 ] || patch < patchfile.FreeBSD )
     endif
-    ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
-	[ -d $(DISTDIR)/lib ] || mkdir $(DISTDIR)/lib
-	$(MAKE) -C $(DISTDIR)
+    ifeq ($(OS),darwin)
+	cat $(TEMPSETTINGS) | sed s/unix-gcc/osx/ > $(USERSETTINGS)
     endif
     ifeq ($(OS),windows)
-	[ -d $(DISTDIR)/lib ] || mkdir $(DISTDIR)/lib
 	# compile with MSVC
-	mv $(USERSETTINGS) $(TEMPSETTINGS)
 	cat $(TEMPSETTINGS) | sed s/unix-gcc/msvc/ > $(USERSETTINGS)
 	env PATH=".:$(PATH)" $(MAKE) -C $(DISTDIR)
-	mv $(TEMPSETTINGS) $(USERSETTINGS)
     endif
+    ifeq ($(OS),$(findstring $(OS), "freebsd linux darwin"))
+	$(MAKE) -C $(DISTDIR)
+    endif
+	# restore settings
+	mv $(TEMPSETTINGS) $(USERSETTINGS)
 
 # fake debug target
 debug:
 
 install: all
-    ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
+    ifeq ($(OS),$(findstring $(OS), "freebsd linux darwin"))
 	[ -d $(LCGDIR) ] || mkdir $(LCGDIR)
 	[ -d $(NAN_ODE) ] || mkdir $(NAN_ODE)
 	[ -d $(NAN_ODE)/include ] || mkdir $(NAN_ODE)/include
@@ -91,7 +96,7 @@ install: all
     endif
 
 clean:
-    ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
+    ifeq ($(OS),$(findstring $(OS), "freebsd linux darwin"))
 	[ ! -f dist/Makefile ] || $(MAKE) -C dist clean
     endif
     ifeq ($(OS),freebsd)
-- 
cgit v1.2.3