# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1380255622 -10800
# Node ID b59a3650ed51c3f2c2b2afb588881a1370d8daf0
# Parent  44a20d72f3a6073e3e5d48e79a9738acad3940fb
mac fixes

diff -r 44a20d72f3a6 -r b59a3650ed51 generators/README
--- a/generators/README	Fri Sep 27 07:14:49 2013 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-generators planned:
-- goatprim: primitive object generator
-- goatflake: sphereflake generator
-- goatpot: utah teapot generator
-- goatgoat: articulated goat generator w/anim
-- goatfly: camera flyby generator w/anim
diff -r 44a20d72f3a6 -r b59a3650ed51 generators/goatprim/Makefile
--- a/generators/goatprim/Makefile	Fri Sep 27 07:14:49 2013 +0300
+++ b/generators/goatprim/Makefile	Fri Sep 27 07:20:22 2013 +0300
@@ -6,13 +6,13 @@
 ifeq ($(shell uname -s), Darwin)
 	libgoat = $(goat_root)/libgoat3d.dylib
 else
-	libgoat = $(goat_root)/libgoat3d.so.0.1
+	libgoat = $(goat_root)/libgoat3d.so.0.1 -Wl,-rpath=$(goat_root)
 endif
 
 CC = clang
 CXX = clang++
 CFLAGS = -pedantic -Wall -g -I$(goat_root)/src
-LDFLAGS = $(libgoat) -Wl,-rpath $(goat_root)
+LDFLAGS = $(libgoat)
 
 $(bin): $(obj) $(libgoat)
 	$(CXX) -o $@ $(obj) $(LDFLAGS)
diff -r 44a20d72f3a6 -r b59a3650ed51 goatview/Makefile
--- a/goatview/Makefile	Fri Sep 27 07:14:49 2013 +0300
+++ b/goatview/Makefile	Fri Sep 27 07:20:22 2013 +0300
@@ -4,17 +4,18 @@
 bin = goatview
 
 goat_root = ..
-libgoat = $(goat_root)/libgoat3d.so.0.1
 
 CC = clang
 CPP = clang -E
 CFLAGS = -pedantic -Wall -g -I$(goat_root)/src
-LDFLAGS = $(libgoat) -Wl,-rpath=$(goat_root) $(libgl)
+LDFLAGS = $(libgoat) $(libgl)
 
 ifeq ($(shell uname -s), Darwin)
 	libgl = -framework OpenGL -framework GLUT -lGLEW
+	libgoat = $(goat_root)/libgoat3d.dylib
 else
 	libgl = -lGL -lGLU -lglut -lGLEW
+	libgoat = $(goat_root)/libgoat3d.so.0.1 -Wl,-rpath=$(goat_root) 
 endif
 
 $(bin): $(obj) $(libgoat)