[PD-cvs] externals/OSCx/src Makefile.in,1.3,1.4 OSC-pattern-match.c,1.2,1.3 OSC.c,1.2,1.3 OSCroute.c,1.2,1.3 dumpOSC.c,1.2,1.3 htmsocket.c,1.2,1.3

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals/OSCx/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28460/src

Modified Files:
	Makefile.in OSC-pattern-match.c OSC.c OSCroute.c dumpOSC.c 
	htmsocket.c 
Log Message:
cleaned up build system, especially for Darwin/MacOS X

Index: OSC-pattern-match.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-pattern-match.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSC-pattern-match.c	10 Mar 2004 00:01:56 -0000	1.2
--- OSC-pattern-match.c	4 Apr 2004 22:10:41 -0000	1.3
***************
*** 40,44 ****
  #endif
  
! // #ifdef MACOSX
  // #include <stdio.h>
  // #endif
--- 40,44 ----
  #endif
  
! // #ifdef __APPLE__
  // #include <stdio.h>
  // #endif

Index: htmsocket.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/htmsocket.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** htmsocket.c	10 Mar 2004 00:01:56 -0000	1.2
--- htmsocket.c	4 Apr 2004 22:10:41 -0000	1.3
***************
*** 41,45 ****
  #endif
  
! #ifdef MACOSX
    #include <string.h>
  #endif
--- 41,45 ----
  #endif
  
! #ifdef __APPLE__
    #include <string.h>
  #endif

Index: dumpOSC.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/dumpOSC.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dumpOSC.c	10 Mar 2004 00:01:56 -0000	1.2
--- dumpOSC.c	4 Apr 2004 22:10:41 -0000	1.3
***************
*** 79,83 ****
  
  
! #if defined(__sgi) || defined(__linux) || defined(WIN32) || defined(MACOSX)
  
  #ifdef WIN32
--- 79,83 ----
  
  
! #if defined(__sgi) || defined(__linux) || defined(WIN32) || defined(__APPLE__)
  
  #ifdef WIN32

Index: Makefile.in
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.in	10 Mar 2004 17:45:05 -0000	1.3
--- Makefile.in	4 Apr 2004 22:10:41 -0000	1.4
***************
*** 10,13 ****
--- 10,15 ----
  prefix=$(DESTDIR)/usr
  
+ current: @pd_suffix@
+ 
  # ----------------------- LINUX i386 -----------------------
  
***************
*** 43,52 ****
  OSC.pd_linux: OSC.o
  	cc -Wl,-export_dynamic -shared -o $*. at 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:
--- 45,54 ----
  OSC.pd_linux: OSC.o
  	cc -Wl,-export_dynamic -shared -o $*. at 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:
***************
*** 76,85 ****
  .SUFFIXES: $(SFX)
  
! DARWINCFLAGS = -DPD -DUNIX -DMACOSX -O2 \
      -Wall -W -Wshadow -Wstrict-prototypes \
      -Wno-unused -Wno-parentheses -Wno-switch
  
  # where is your m_pd.h ???
! DARWININCLUDE =  -I../../../pd/src
  
  DARWINEXTERNALS = htmsocket.o OSC-pattern-match.o sendOSC.o dumpOSC.o OSCroute.o
--- 78,87 ----
  .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
***************
*** 87,94 ****
  .c.pd_darwin:
  	cc $(DARWINCFLAGS) $(DARWININCLUDE) -c *.c
! 	cc -bundle -bundle_loader /usr/local/pd/bin/pd -flat_namespace -o $*.pd_darwin $*.o $(DARWINEXTERNALS) $(LIBS) $(LIBOSC)
  
  	rm -f $*.o ../$*.pd_darwin
! 	ln -s $*/$*.pd_darwin ..
  
  
--- 89,96 ----
  .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 ..
  
  

Index: OSC.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSC.c	10 Mar 2004 00:01:56 -0000	1.2
--- OSC.c	4 Apr 2004 22:10:41 -0000	1.3
***************
*** 4,8 ****
  	-------------
  		-- tweaks for Win32    www.zeggz.com/raf	13-April-2002
! 
  */
  
--- 4,8 ----
  	-------------
  		-- tweaks for Win32    www.zeggz.com/raf	13-April-2002
! 		-- smoothed out build, clean up for Darwin  <hans at at.or.at> 2004.04.04
  */
  
***************
*** 48,52 ****
    post("OSC4PD Version " VERSION
         "\n ¯\\    original code by matt wright. pd-fication jdl at xdv.org\n"
!        "   ·   Win32-port raf at interaccess.com\n    \\_ Compiled " __TIME__ " " __DATE__);
    // ExitCallback();
  }
--- 48,53 ----
    post("OSC4PD Version " VERSION
         "\n ¯\\    original code by matt wright. pd-fication jdl at xdv.org\n"
!        "   ·   Win32-port raf at interaccess.com    Darwin cleanup hans at at.or.at\n"
! 		 "		 \\_ Compiled " __TIME__ " " __DATE__);
    // ExitCallback();
  }

Index: OSCroute.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSCroute.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSCroute.c	10 Mar 2004 00:01:56 -0000	1.2
--- OSCroute.c	4 Apr 2004 22:10:41 -0000	1.3
***************
*** 62,66 ****
  	#include <string.h>
  #endif
! #ifdef MACOSX
    #include <stdio.h>
  #endif
--- 62,66 ----
  	#include <string.h>
  #endif
! #ifdef __APPLE__
    #include <stdio.h>
  #endif