# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1305363742 -10800
# Node ID bf34fa6779608fec94359617bcb83c06cb6fcbed
# Parent  b925dabd4e96eeaa4a7c2f4a883fdc63b1dc13ad
- fixed mac issues.

diff -r b925dabd4e96 -r bf34fa677960 Makefile.in
--- a/Makefile.in	Sat May 14 09:06:46 2011 +0300
+++ b/Makefile.in	Sat May 14 12:02:22 2011 +0300
@@ -14,7 +14,7 @@
 sharedopt_unix = -shared -Wl,-soname,$(soname)
 sharedopt_mac = -dynamiclib
 
-ifeq ($(shell uname -a), Darwin)
+ifeq ($(shell uname -s), Darwin)
 	sys = mac
 else
 	sys = unix
diff -r b925dabd4e96 -r bf34fa677960 configure
--- a/configure	Sat May 14 09:06:46 2011 +0300
+++ b/configure	Sat May 14 12:02:22 2011 +0300
@@ -5,7 +5,7 @@
 
 extract()
 {
-	grep "$2:" $1 | sed "s/^.*$2:\(.*\)\*\//\1/" | awk '{ print $1 }'
+	grep "$2:" $1 | sed "s/^.*$2: *\(.*\)\*\//\1/"
 }
 
 get_depline()
@@ -68,9 +68,9 @@
 	fi
 
 	name=`echo $m | sort | sed 's/src\/wsys_//' | sed 's/\.c//'`
-	echo -n "-> trying module $name (needs: $dep) ... "
+	`which echo` -n "-> trying module $name (needs: $dep) ... "
 
-	if try_link $dep; then
+	if try_link "$dep"; then
 		echo ok
 
 		libs="$libs $dep"
diff -r b925dabd4e96 -r bf34fa677960 src/wsys_glut.c
--- a/src/wsys_glut.c	Sat May 14 09:06:46 2011 +0300
+++ b/src/wsys_glut.c	Sat May 14 12:02:22 2011 +0300
@@ -6,6 +6,7 @@
 
 #ifdef USE_WSYS_MODULE_GLUT
 
+#include <stdlib.h>
 #include <setjmp.h>
 #ifndef __APPLE__
 #include <GL/glut.h>
diff -r b925dabd4e96 -r bf34fa677960 tests/simple/simple.c
--- a/tests/simple/simple.c	Sat May 14 09:06:46 2011 +0300
+++ b/tests/simple/simple.c	Sat May 14 12:02:22 2011 +0300
@@ -1,6 +1,10 @@
 #include <stdio.h>
 #include <ctype.h>
+#ifndef __APPLE__
 #include <GL/gl.h>
+#else
+#include <OpenGL/gl.h>
+#endif
 #include "sgl.h"
 
 void disp(void);
diff -r b925dabd4e96 -r bf34fa677960 tests/tests-makefile
--- a/tests/tests-makefile	Sat May 14 09:06:46 2011 +0300
+++ b/tests/tests-makefile	Sat May 14 12:02:22 2011 +0300
@@ -3,15 +3,27 @@
 src = $(wildcard *.c)
 obj = $(src:.c=.o)
 
+ifeq ($(shell uname -s), Darwin)
+	libsgl = libsgl.dylib
+	libgl = -framework OpenGL
+else
+	libsgl = libsgl.so
+	libgl = -lGL -lGLU
+	rpath = -Wl,-rpath=.
+endif
+
 sgldir = ../..
 
 CC = gcc
 CFLAGS = -pedantic -Wall -g -I$(sgldir)/include
-LDFLAGS = -L. -Wl,-rpath=. -lsgl -lGL -lGLU -lm
+LDFLAGS = -L. $(rpath) -lsgl $(libgl) -lm
 
-$(bin): $(obj) libsgl.so
+$(bin): $(obj) $(libsgl)
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
+libsgl.dylib: $(sgldir)/libsgl.dylib
+	ln -s $< $@
+
 libsgl.so: $(sgldir)/libsgl.so.0.0
 	ln -s $< $@.0
 	ln -s $< $@