diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-11-15 06:24:23 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-11-15 06:24:23 +0000 |
| commit | 096390ba8cecb37e18a0749012efcb0bec08fe93 (patch) | |
| tree | 8553945198d1618bea6cff5b1ef74fb893dec4dc | |
| parent | a326ebe11e1aa71ec44428ea0805639f0ea35823 (diff) | |
minor compile fixes for Mac OS X and MinGW; added [mtx_inverse]
svn path=/trunk/; revision=3911
| -rw-r--r-- | externals/build/darwin/makefile | 22 | ||||
| -rw-r--r-- | externals/build/src/mtx_inverse.c | 3 | ||||
| -rw-r--r-- | externals/build/src/piperead~.c | 2 | ||||
| -rw-r--r-- | externals/build/src/pipewrite~.c | 2 | ||||
| -rw-r--r-- | externals/build/src/plugin~.c | 4 |
5 files changed, 14 insertions, 19 deletions
diff --git a/externals/build/darwin/makefile b/externals/build/darwin/makefile index 5713b61a..4fcc983c 100644 --- a/externals/build/darwin/makefile +++ b/externals/build/darwin/makefile @@ -1,9 +1,9 @@ prefix=/tmp #prefix=$(DESTDIR)/usr/local/lib/pd -EXTERNALS = $(shell ls ) +EXTERNALS = $(shell ls -1 ../src | grep -e '.*\.c$$') -all: link.stamp $(EXTERNALS:.c=.pd_darwin) +all: $(EXTERNALS:.c=.pd_darwin) .SUFFIXES: .pd_darwin @@ -36,9 +36,8 @@ LDFLAGS = -bundle -bundle_loader $(PDEXECUTABLE) -L/sw/lib rm -f "$*.o" clean: - -rm *.pd_darwin *~ *.c *.o - -rm -rf root *.pkg - -rm link.stamp + -rm *.pd_darwin *~ + -rm -rf root *.pkg install-doc: test -d $(prefix)/doc/5.reference || mkdir -p $(prefix)/doc/5.reference @@ -55,19 +54,8 @@ install: install-doc test -d $(prefix)/extra || mkdir -p $(prefix)/extra install -m644 *.pd_darwin $(prefix)/extra -link: link.stamp -link.stamp: - cp ../src/*.c . -# MacOSX exceptions that don't work just yet (if ever) - -rm ossmixer.c plugin~.c cdplayer.c promiscous~.c serialctl.c \ - serial_bird.c serial_ms.c proc.c streamin~.c streamout~.c rhythm_* \ - piperead~.c pipewrite~.c - touch link.stamp - make - - -EXTERNALS_VERSION = $(shell date +20%y.%m.%d) +EXTERNALS_VERSION := $(shell date +20%y.%m.%d) PACKAGE_PREFIX = pd-externals PACKAGE_NAME = $(PACKAGE_PREFIX)-$(EXTERNALS_VERSION) diff --git a/externals/build/src/mtx_inverse.c b/externals/build/src/mtx_inverse.c index af138b2a..d6816fa5 100644 --- a/externals/build/src/mtx_inverse.c +++ b/externals/build/src/mtx_inverse.c @@ -1,5 +1,8 @@ #include "../../iem/iemmatrix/src/mtx_matrix.c" #include "../../iem/iemmatrix/src/mtx_inverse.c" +#include "../../iem/iemmatrix/src/mtx_transpose.c" +#include "../../iem/iemmatrix/src/mtx_mul.c" +#include "../../iem/iemmatrix/src/mtx_binops.c" void iemmatrix_sources_setup(void) { diff --git a/externals/build/src/piperead~.c b/externals/build/src/piperead~.c index 6e52c6c7..6414f269 100644 --- a/externals/build/src/piperead~.c +++ b/externals/build/src/piperead~.c @@ -1 +1,3 @@ +#ifndef __APPLE__ #include "../../ext13/piperead~.c" +#endif diff --git a/externals/build/src/pipewrite~.c b/externals/build/src/pipewrite~.c index e9673dbd..6670875b 100644 --- a/externals/build/src/pipewrite~.c +++ b/externals/build/src/pipewrite~.c @@ -1 +1,3 @@ +#ifndef __APPLE__ #include "../../ext13/pipewrite~.c" +#endif diff --git a/externals/build/src/plugin~.c b/externals/build/src/plugin~.c index 92b24a4f..935aa3df 100644 --- a/externals/build/src/plugin~.c +++ b/externals/build/src/plugin~.c @@ -1,5 +1,5 @@ - - +#ifdef __gnu_linux__ #include <../../plugin~/jload.c> #include <../../plugin~/jsearch.c> #include <../../plugin~/plugin~.c> +#endif |