From 4ddc89a36ab33d0b660b7312b9b9f9557e820a78 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 4 Apr 2004 22:10:41 +0000
Subject: cleaned up build system, especially for Darwin/MacOS X

svn path=/trunk/externals/OSCx/; revision=1549
---
 libOSC/Makefile.in  | 9 ++++-----
 libOSC/OSC-client.c | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'libOSC')

diff --git a/libOSC/Makefile.in b/libOSC/Makefile.in
index 26dca72..d67ba88 100644
--- a/libOSC/Makefile.in
+++ b/libOSC/Makefile.in
@@ -1,19 +1,18 @@
-CFLAGS=  -O2 -Wall -fPIC
+#CFLAGS=  -O2 -Wall -fPIC
 ARFLAGS=srv
 # uncomment the following for linux/win
 # DEFS= -Dunix
-# and this for osx
-# DEFS= -Dunix -DMACOSX
 LIB=libOSC.a
 
-CFLAGS= @CFLAGS@
+CFLAGS=@CFLAGS@
+INCLUDES=@INCLUDES@
 
 LIBOBJS= ${LIB}(OSC-client.o) ${LIB}(OSC-timetag.o)
 
 all:	${LIBOBJS}
 
 .c.a:
-	${CC} -c ${CFLAGS} ${DEFS} $<
+	${CC} -c ${CFLAGS} ${INCLUDES} ${DEFS} $<
 	${AR} ${ARFLAGS} $@ $*.o
 	rm -f $*.o
 
diff --git a/libOSC/OSC-client.c b/libOSC/OSC-client.c
index 972aa52..c85d09a 100644
--- a/libOSC/OSC-client.c
+++ b/libOSC/OSC-client.c
@@ -64,7 +64,7 @@ University of California, Berkeley.
 	#include 	<sys/stat.h>
 #endif
 
-#ifdef MACOSX
+#ifdef __APPLE__
   #include <sys/types.h>
 #endif
 
-- 
cgit v1.2.1