[PD-cvs] externals/OSCx/src Makefile.in, 1.8, 1.9 OSC-common.h, 1.4, 1.5 dumpOSC.c, 1.5, 1.6 - Pd-cvs

19 Dec 2005


      Update of /cvsroot/pure-data/externals/OSCx/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7312/src
Modified Files:
    Makefile.in OSC-common.h dumpOSC.c 
Log Message:
fixed up OSC for MinGW, doesn't compile the OSC.dll lib, but the individual objects compile fine
Index: Makefile.in
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in	18 Aug 2004 22:35:23 -0000	1.8
--- Makefile.in	19 Dec 2005 04:11:47 -0000	1.9
***************
*** 18,22 ****
EXT=o
! LIBS = -lm -lc
  LIBOSC = ../libOSC/@LIBOSC@
--- 18,22 ----
EXT=o
! LIBS = @LIBS@
  LIBOSC = ../libOSC/@LIBOSC@
***************
*** 36,52 ****
dumpOSC.@pd_suffix@: dumpOSC.o
! 	cc $(LDFLAGS) -o dumpOSC.@pd_suffix@ $? -lc -lm
sendOSC.@pd_suffix@: sendOSC.o htmsocket.o OSC-system-dependent.o
! 	cc $(LDFLAGS) -o sendOSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
OSCroute.@pd_suffix@: OSCroute.o OSC-pattern-match.o OSC-system-dependent.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 OSC-system-dependent.o
! 	cc $(LDFLAGS) -o OSC.@pd_suffix@ $? -lc -lm $(LIBOSC)
$(TARGETS): %.o : %.c
! 	cc $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c
# ----------------------------------------------------------
--- 36,52 ----
dumpOSC.@pd_suffix@: dumpOSC.o
! 	$(CC) $(LDFLAGS) -o dumpOSC.@pd_suffix@ $? $(LIBS)
sendOSC.@pd_suffix@: sendOSC.o htmsocket.o OSC-system-dependent.o
! 	$(CC) $(LDFLAGS) -o sendOSC.@pd_suffix@ $? $(LIBS) $(LIBOSC)
OSCroute.@pd_suffix@: OSCroute.o OSC-pattern-match.o OSC-system-dependent.o
! 	$(CC) $(LDFLAGS) -o OSCroute.@pd_suffix@ $? $(LIBS)
OSC.@pd_suffix@: OSC.o sendOSC.o dumpOSC.o OSCroute.o htmsocket.o OSC-pattern-match.o OSC-system-dependent.o
! 	$(CC) $(LDFLAGS) -o OSC.@pd_suffix@ $? $(LIBS) $(LIBOSC)
$(TARGETS): %.o : %.c
! 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $*.o $*.c
# ----------------------------------------------------------
Index: OSC-common.h
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/OSC-common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OSC-common.h	30 Aug 2005 20:54:05 -0000	1.4
--- OSC-common.h	19 Dec 2005 04:11:47 -0000	1.5
***************
*** 35,38 ****
--- 35,41 ----
  */
+ #ifndef _OSC_COMMON_H
+ #define _OSC_COMMON_H
+ 
  /* Boolean type */
***************
*** 42,59 ****
  #define FALSE 0
  #endif
! 
! 
! #ifdef WIN32
! 	#include <stdio.h>
! 	#ifdef OSC_EXPORTS
! 		#define OSC_API __declspec(dllexport)
! 	#else
! 		#define OSC_API __declspec(dllimport)
! 	#endif
! 	#ifdef _DEBUG
! 		#define DEBUG
! 	#endif
! #endif
! 
  //#define int32_t t_int
--- 45,62 ----
  #define FALSE 0
  #endif
! 
! 
! #ifdef _WIN32
! 	#include <stdio.h>
! 	#ifdef OSC_EXPORTS
! 		#define OSC_API __declspec(dllexport)
! 	#else
! 		#define OSC_API __declspec(dllimport)
! 	#endif
! 	#ifdef _DEBUG
! 		#define DEBUG
! 	#endif
! #endif
! 
  //#define int32_t t_int
***************
*** 72,73 ****
--- 75,80 ----
  void OSCWarning(char *s, ...);
+ 
+ 
+ #endif /* _OSC_COMMON_H */
+
Index: dumpOSC.c
===================================================================
RCS file: /cvsroot/pure-data/externals/OSCx/src/dumpOSC.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dumpOSC.c	30 Aug 2005 20:54:05 -0000	1.5
--- dumpOSC.c	19 Dec 2005 04:11:47 -0000	1.6
***************
*** 81,88 ****
! #if defined(__sgi) || defined(__linux) || defined(WIN32) || defined(__APPLE__)
! #ifdef WIN32
    #include "OSC-common.h"
    #include <winsock2.h>	
    #include <string.h>
--- 81,90 ----
! #if defined(__sgi) || defined(__linux) || defined(_WIN32) || defined(__APPLE__)
! #ifdef _WIN32
!    #ifdef _MSC_VER
    #include "OSC-common.h"
+    #endif /* _MSC_VER */
    #include <winsock2.h>	
    #include <string.h>
***************
*** 123,127 ****
    #include <sys/lock.h>
    #endif
! #endif
--- 125,129 ----
    #include <sys/lock.h>
    #endif
! #endif /* _WIN32 */
***************
*** 330,334 ****
  }
! #ifdef WIN32
  OSC_API void dumpOSC_setup(void)
  #else
--- 332,336 ----
  }
! #ifdef _MSC_VER
  OSC_API void dumpOSC_setup(void)
  #else