Update of /cvsroot/pure-data/externals/OSCx/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24275/src
Modified Files: Makefile.in OSC.c Log Message: made unified autoconf build, should work with MinGW also
Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 4 Apr 2004 22:10:41 -0000 1.4 --- Makefile.in 5 Apr 2004 04:26:00 -0000 1.5 *************** *** 1,59 **** ! # 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 ! ! SFX=@pd_suffix@ ! ! .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
! # 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 TARGETS = $(SOURCES:.c=.o) EXTS=sendOSC.@pd_suffix@ dumpOSC.@pd_suffix@ OSCroute.@pd_suffix@ OSC.@pd_suffix@
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
! 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
! # cc -c $(CFLAGS) OSC.c
! # .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
# ---------------------------------------------------------- --- 1,35 ---- ! EXT=o LIBS = -lm -lc ! LIBOSC = ../libOSC/@LIBOSC@
! CFLAGS = @CFLAGS@ ! INCLUDES = @INCLUDES@ ! LDFLAGS = @LDFLAGS@
! prefix=$(DESTDIR)/usr
! 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_suffix@: sendOSC.o htmsocket.o ! cc $(LDFLAGS) -o sendOSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
! 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
! 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) ! ! $(TARGETS): %.o : %.c ! cc $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c
# ---------------------------------------------------------- *************** *** 69,96 **** 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 .. - - --- 45,46 ----
Index: OSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** OSC.c 4 Apr 2004 22:10:41 -0000 1.3 --- OSC.c 5 Apr 2004 04:26:00 -0000 1.4 *************** *** 48,53 **** 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__); // ExitCallback(); } --- 48,53 ---- post("OSC4PD Version " VERSION "\n ¯\ original code by matt wright. pd-fication jdl@xdv.org\n" ! " · Win32-port raf@interaccess.com unified versions hans@at.or.at\n" ! " \_ Compiled " __TIME__ " " __DATE__); // ExitCallback(); }