From 80acb0412478a6705f7a3f364acd34c2045a34bf Mon Sep 17 00:00:00 2001
From: Hans Lambermont <hans@lambermont.dyndns.org>
Date: Sat, 11 Jan 2003 23:20:10 +0000
Subject: Enable automated build and install runs on FreeBSD for ODE. ODE does
 not build on FreeBSD out of the box, so an automated patchfile is included as
 well. The 'clean' target reverses the patches that were done by 'all'.

---
 extern/ode/Makefile           | 16 ++++++++++++----
 extern/ode/dist/FreeBSD-patch | 20 --------------------
 extern/ode/patchfile.FreeBSD  | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 24 deletions(-)
 delete mode 100644 extern/ode/dist/FreeBSD-patch
 create mode 100644 extern/ode/patchfile.FreeBSD

(limited to 'extern/ode')

diff --git a/extern/ode/Makefile b/extern/ode/Makefile
index 9a0f6cbc4a4..5e33148ec3e 100644
--- a/extern/ode/Makefile
+++ b/extern/ode/Makefile
@@ -35,12 +35,16 @@ DISTDIR = dist
 CP = ../../intern/tools/cpifdiff.sh
 
 all:
-    ifeq ($(OS),$(findstring $(OS), "linux"))
+    ifeq ($(OS),freebsd)
+	(grep FreeBSD $(DISTDIR)/Makefile >/dev/null ; \
+	    [ $$? -eq 0 ] || patch < patchfile.FreeBSD )
+    endif
+    ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
 	$(MAKE) -C $(DISTDIR)
     endif
 
-install:
-    ifeq ($(OS),$(findstring $(OS), "linux"))
+install: all
+    ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
 	@echo "====> $(MAKE) $@ in $(SOURCEDIR)"
 	[ -d $(LCGDIR) ] || mkdir $(LCGDIR)
 	[ -d $(NAN_ODE) ] || mkdir $(NAN_ODE)
@@ -58,7 +62,11 @@ install:
     endif
 
 clean:
-    ifeq ($(OS),$(findstring $(OS), "linux"))
+    ifeq ($(OS),$(findstring $(OS), "freebsd linux"))
 	[ ! -f dist/Makefile ] || $(MAKE) -C dist clean
     endif
+    ifeq ($(OS),freebsd)
+	(grep FreeBSD $(DISTDIR)/Makefile >/dev/null ; \
+	    [ $$? -ne 0 ] || patch -R < patchfile.FreeBSD )
+    endif
 
diff --git a/extern/ode/dist/FreeBSD-patch b/extern/ode/dist/FreeBSD-patch
deleted file mode 100644
index c1a94ae62c3..00000000000
--- a/extern/ode/dist/FreeBSD-patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u -w -r1.2 Makefile
---- Makefile	4 Nov 2002 21:55:48 -0000	1.2
-+++ Makefile	4 Jan 2003 20:18:18 -0000
-@@ -243,13 +243,13 @@
- 	-$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H)
- 
- %$(OBJ): %.c
--	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
-+	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) -I/usr/X11R6/include $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
- 
- %$(OBJ): %.cpp
--	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
-+	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) -I/usr/X11R6/include $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
- 
- %.exe: %$(OBJ)
--	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
-+	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) -lXext
- 
- # windows specific rules
- 
diff --git a/extern/ode/patchfile.FreeBSD b/extern/ode/patchfile.FreeBSD
new file mode 100644
index 00000000000..1725a3acc45
--- /dev/null
+++ b/extern/ode/patchfile.FreeBSD
@@ -0,0 +1,22 @@
+--- dist/Makefile.org	Sat Jan 11 23:55:46 2003
++++ dist/Makefile	Sat Jan 11 23:55:36 2003
+@@ -242,14 +242,16 @@
+ clean:
+ 	-$(DEL_CMD) $(ODE_OBJECTS) $(ODE_TEST_EXE) $(ODE_LIB) $(DRAWSTUFF_OBJECTS) $(DRAWSTUFF_TEST_EXE) $(DRAWSTUFF_LIB) ode/test/*$(OBJ) drawstuff/dstest/*$(OBJ) $(CONFIGURATOR_EXE) $(CONFIG_H)
+ 
++# Patched for FreeBSD
++
+ %$(OBJ): %.c
+-	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
++	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) -I/usr/X11R6/include $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
+ 
+ %$(OBJ): %.cpp
+-	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
++	$(CC) $(C_FLAGS) $(C_INC)$(INCPATH) -I/usr/X11R6/include $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
+ 
+ %.exe: %$(OBJ)
+-	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)
++	$(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH) -lXext
+ 
+ # windows specific rules
+ 
-- 
cgit v1.2.3