From 517834e74ade4c7e25c29bb084b6c25408480a1b Mon Sep 17 00:00:00 2001
From: jestin
Date: Thu, 9 Oct 2003 11:48:10 +0000
Subject: Modified makefiles to allow compilation on OSX

---
 src/Makefile     | 4 ++--
 src/Makefile.osx | 6 +++---
 src/ivysocket.c  | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 2aca893..76d63cd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -27,8 +27,8 @@ GTKLIB = `gtk-config --libs`
 #GTKLIB = -L/usr/lib -L/usr/X11R6/lib
 GLUTINC = -I/usr/include -I.
 GLUTLIB = -L.
-TCLINCL	= -I/usr/include/tcl8.2
-TCLLIB = -ltcl8.2
+TCLINCL	= -I/usr/include/tcl8.4
+TCLLIB = -ltcl8.4
 
 CC=gcc
 CFLAGS = -g
diff --git a/src/Makefile.osx b/src/Makefile.osx
index 3825756..5d626b3 100644
--- a/src/Makefile.osx
+++ b/src/Makefile.osx
@@ -17,10 +17,10 @@
 
 
 MAJOR=3
-MINOR=4
+MINOR=5
 
 CC=gcc
-CFLAGS = -g
+CFLAGS = -g -I/usr/X11R6/include
 OBJ = ivyloop.o timer.o ivysocket.o ivy.o 
 GOBJ = ivyloop.o timer.o ivysocket.o givy.o
 #GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o
@@ -85,7 +85,7 @@ libivy.$(MAJOR).$(MINOR).dylib: $(OBJ)
 #	$(GLUTOBJ) $(GLUTLIB) -lX11 -lc
 
 clean:
-	-rm -f $(TARGETS) *.o *.a *.so *.so.* *~
+	-rm -f $(TARGETS) *.o *.a *.so *.so.* *~ *.dylib
 
 installlibs: static-libs shared-libs
 	test -d $(PREFIX)/usr/lib || mkdirhier $(PREFIX)/usr/lib
diff --git a/src/ivysocket.c b/src/ivysocket.c
index 3d996de..409a66f 100644
--- a/src/ivysocket.c
+++ b/src/ivysocket.c
@@ -30,6 +30,9 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifdef __APPLE__
+#define _BSD_SOCKLEN_T_ int
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-- 
cgit v1.1