Update of /cvsroot/pure-data/externals/OSCx/send+dump In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28460/send+dump
Modified Files: Makefile.in dumpOSC.c htmsocket.c Log Message: cleaned up build system, especially for Darwin/MacOS X
Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 10 Mar 2004 00:01:56 -0000 1.1 --- Makefile.in 4 Apr 2004 22:10:41 -0000 1.2 *************** *** 3,8 **** # for eg. linux # DEFS= -Dunix - # for MAC OSX, should be DARWIN - # DEFS=-Dunix -DMACOSX
CFLAGS= @CFLAGS@ --- 3,6 ---- *************** *** 19,23 **** dumpOSC: ${DUMPOBJS} ${CC} ${CFLAGS} $(INCLUDES) -o $@ ${DUMPOBJS} ! dumpUDP: dumpUDP.o ${CC} ${CFLAGS} $(INCLUDES) -o dumpUDP dumpUDP.o --- 17,21 ---- dumpOSC: ${DUMPOBJS} ${CC} ${CFLAGS} $(INCLUDES) -o $@ ${DUMPOBJS} ! dumpUDP: dumpUDP.o ${CC} ${CFLAGS} $(INCLUDES) -o dumpUDP dumpUDP.o
Index: htmsocket.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/htmsocket.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** htmsocket.c 13 Feb 2004 00:34:33 -0000 1.5 --- htmsocket.c 4 Apr 2004 22:10:41 -0000 1.6 *************** *** 63,67 **** #include <sys/time.h> #include <sys/types.h> ! #ifndef MACOSX #include <sys/prctl.h> #endif --- 63,67 ---- #include <sys/time.h> #include <sys/types.h> ! #ifndef __APPLE__ #include <sys/prctl.h> #endif
Index: dumpOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/dumpOSC.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dumpOSC.c 10 Mar 2004 00:01:56 -0000 1.5 --- dumpOSC.c 4 Apr 2004 22:10:41 -0000 1.6 *************** *** 84,88 **** #include <grp.h> #include <sys/file.h> ! #ifndef MACOSX #include <sys/prctl.h> #include <bits/sigset.h> --- 84,88 ---- #include <grp.h> #include <sys/file.h> ! #ifndef __APPLE__ #include <sys/prctl.h> #include <bits/sigset.h> *************** *** 117,121 **** --- 117,123 ---- Boolean sgi_HaveToQuit(void); int RegisterPollingDevice(int fd, void (*callbackfunction)(int , void *), void *dummy); + #ifndef __APPLE__ static void catch_sigint(); + #endif static int Synthmessage(char *m, int n, void *clientdesc, int clientdesclength, int fd) ; void ParseOSCPacket(char *buf, int n, ClientAddr returnAddr); *************** *** 233,239 **** --- 235,243 ---- static int caught_sigint;
+ #ifndef __APPLE__ static void catch_sigint() { caught_sigint = 1; } + #endif static int sockfd, usockfd;
*************** *** 635,639 **** */ caught_sigint = 0; ! #ifndef MACOSX sigset(SIGINT, catch_sigint); /* set sig handler */ #endif --- 639,643 ---- */ caught_sigint = 0; ! #ifndef __APPLE__ sigset(SIGINT, catch_sigint); /* set sig handler */ #endif