diff options
author | Hans Lambermont <hans@lambermont.dyndns.org> | 2003-01-12 02:20:10 +0300 |
---|---|---|
committer | Hans Lambermont <hans@lambermont.dyndns.org> | 2003-01-12 02:20:10 +0300 |
commit | 80acb0412478a6705f7a3f364acd34c2045a34bf (patch) | |
tree | 78da807dea1fda279ff915b17150c1c3b8b152bf /extern/ode | |
parent | a1a8edffeb418a736c7eb7beaf16564774504030 (diff) |
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'.
Diffstat (limited to 'extern/ode')
-rw-r--r-- | extern/ode/Makefile | 16 | ||||
-rw-r--r-- | extern/ode/patchfile.FreeBSD (renamed from extern/ode/dist/FreeBSD-patch) | 10 |
2 files changed, 18 insertions, 8 deletions
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/patchfile.FreeBSD index c1a94ae62c3..1725a3acc45 100644 --- a/extern/ode/dist/FreeBSD-patch +++ b/extern/ode/patchfile.FreeBSD @@ -1,9 +1,11 @@ -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 @@ +--- 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)$@ $< |