aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in90
-rw-r--r--src/OSC.c4
2 files changed, 22 insertions, 72 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 5fd81cd..03e256e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,60 +1,36 @@
-# current: all
-# pd_linux
-###############################
-NAME=OSC
+
EXT=o
LIBS = -lm -lc
-LIBOSC = ../libOSC/libOSC.a
-DEFS= -Dunix
-
-prefix=$(DESTDIR)/usr
-
-current: @pd_suffix@
-
-# ----------------------- LINUX i386 -----------------------
-
-# pd_linux: $(NAME).pd_linux
+LIBOSC = ../libOSC/@LIBOSC@
-SFX=@pd_suffix@
+CFLAGS = @CFLAGS@
+INCLUDES = @INCLUDES@
+LDFLAGS = @LDFLAGS@
-.SUFFIXES: .$(SFX)
-
-CFLAGS += $(DEFS) -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \
- -Wall -W -Wshadow \
- -Wno-unused -Wno-parentheses -Wno-switch
-
-# where is your m_pd.h ???
-INCLUDE = -I../../build/include -I../libOSC
+prefix=$(DESTDIR)/usr
-# LINUXEXTERNALS = htmsocket.o OSC-pattern-match.o sendOSC.o dumpOSC.o OSCroute.o
-# SOURCES = $(wildcard *.c)
-SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c \
-htmsocket.c OSCroute.c sendOSC.c
+SOURCES = OSC-pattern-match.c OSC.c dumpOSC.c htmsocket.c OSCroute.c sendOSC.c
TARGETS = $(SOURCES:.c=.o)
EXTS=sendOSC.@pd_suffix@ dumpOSC.@pd_suffix@ OSCroute.@pd_suffix@ OSC.@pd_suffix@
+# ----------------------- autoconf -----------------------
+
all: $(EXTS)
-sendOSC.pd_linux: htmsocket.o sendOSC.o
- cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ *.o -lc -lm ../libOSC/libOSC.a
-dumpOSC.pd_linux: dumpOSC.o
- cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $*.o -lc -lm
-OSCroute.pd_linux: OSCroute.o OSC-pattern-match.o
- cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $? -lc -lm
+sendOSC.@pd_suffix@: sendOSC.o htmsocket.o
+ cc $(LDFLAGS) -o sendOSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
-OSC.pd_linux: OSC.o
- cc -Wl,-export_dynamic -shared -o $*.@pd_suffix@ $? -lc -lm
-# $(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) *.o $(LIBS) $(LIBOSC)
-# $(LD) $(LDFLAGS) -o OSC.$(EXT) *.$(EXT) $(LIBS) $(LIBOSC)
-$(TARGETS): %.o : %.c
- cc $(CFLAGS) $(INCLUDE) -c -o $*.o $*.c
+dumpOSC.@pd_suffix@: dumpOSC.o
+ cc $(LDFLAGS) -o dumpOSC.@pd_suffix@ $? -lc -lm
+
+OSCroute.@pd_suffix@: OSCroute.o OSC-pattern-match.o
+ cc $(LDFLAGS) -o OSCroute.@pd_suffix@ $? -lc -lm
-# cc -c $(CFLAGS) OSC.c
+OSC.@pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o
+ cc $(LDFLAGS) -o OSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
-# .c.pd_linux:
-# cc -O2 -Wall -DPD -fPIC $(LINUXCFLAGS) $(LINUXINCLUDE) -c *.c
-# ld -export_dynamic -shared -o $*.pd_linux $*.o $(LINUXEXTERNALS) $(LIBS) $(LIBOSC)
-# strip --strip-unneeded $*.pd_linux
+$(TARGETS): %.o : %.c
+ cc $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c
# ----------------------------------------------------------
@@ -68,29 +44,3 @@ install: install-doc
clean:
rm -rf *.$(EXT) *.@pd_suffix@
-
-# ----------------------- Mac OS X (Darwin) -----------------------
-
-pd_darwin: $(NAME).pd_darwin
-
-SFX=.pd_darwin
-
-.SUFFIXES: $(SFX)
-
-DARWINCFLAGS = -DPD -DUNIX -O2 \
- -Wall -W -Wshadow -Wstrict-prototypes \
- -Wno-unused -Wno-parentheses -Wno-switch
-
-# where is your m_pd.h ???
-DARWININCLUDE = @INCLUDES@
-
-DARWINEXTERNALS = htmsocket.o OSC-pattern-match.o sendOSC.o dumpOSC.o OSCroute.o
-
-.c.pd_darwin:
- cc $(DARWINCFLAGS) $(DARWININCLUDE) -c *.c
- cc -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) $(LIBS) $(LIBOSC)
-
- rm -f $*.o ../$*.pd_darwin
-# ln -s $*/$*.pd_darwin ..
-
-
diff --git a/src/OSC.c b/src/OSC.c
index 1b94a7f..dfac679 100644
--- a/src/OSC.c
+++ b/src/OSC.c
@@ -47,8 +47,8 @@ OSC_API void OSC_version (t_OSC *x) {
// EnterCallback();
post("OSC4PD Version " VERSION
"\n ¯\\ original code by matt wright. pd-fication jdl@xdv.org\n"
- " · Win32-port raf@interaccess.com Darwin cleanup hans@at.or.at\n"
- " \\_ Compiled " __TIME__ " " __DATE__);
+ " · Win32-port raf@interaccess.com unified versions hans@at.or.at\n"
+ " \\_ Compiled " __TIME__ " " __DATE__);
// ExitCallback();
}