goat3d

changeset 23:b59a3650ed51

mac fixes
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 27 Sep 2013 07:20:22 +0300
parents 44a20d72f3a6
children 6b651613bd9f
files generators/README generators/goatprim/Makefile goatview/Makefile
diffstat 3 files changed, 5 insertions(+), 10 deletions(-) [+]
line diff
     1.1 --- a/generators/README	Fri Sep 27 07:14:49 2013 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,6 +0,0 @@
     1.4 -generators planned:
     1.5 -- goatprim: primitive object generator
     1.6 -- goatflake: sphereflake generator
     1.7 -- goatpot: utah teapot generator
     1.8 -- goatgoat: articulated goat generator w/anim
     1.9 -- goatfly: camera flyby generator w/anim
     2.1 --- a/generators/goatprim/Makefile	Fri Sep 27 07:14:49 2013 +0300
     2.2 +++ b/generators/goatprim/Makefile	Fri Sep 27 07:20:22 2013 +0300
     2.3 @@ -6,13 +6,13 @@
     2.4  ifeq ($(shell uname -s), Darwin)
     2.5  	libgoat = $(goat_root)/libgoat3d.dylib
     2.6  else
     2.7 -	libgoat = $(goat_root)/libgoat3d.so.0.1
     2.8 +	libgoat = $(goat_root)/libgoat3d.so.0.1 -Wl,-rpath=$(goat_root)
     2.9  endif
    2.10  
    2.11  CC = clang
    2.12  CXX = clang++
    2.13  CFLAGS = -pedantic -Wall -g -I$(goat_root)/src
    2.14 -LDFLAGS = $(libgoat) -Wl,-rpath $(goat_root)
    2.15 +LDFLAGS = $(libgoat)
    2.16  
    2.17  $(bin): $(obj) $(libgoat)
    2.18  	$(CXX) -o $@ $(obj) $(LDFLAGS)
     3.1 --- a/goatview/Makefile	Fri Sep 27 07:14:49 2013 +0300
     3.2 +++ b/goatview/Makefile	Fri Sep 27 07:20:22 2013 +0300
     3.3 @@ -4,17 +4,18 @@
     3.4  bin = goatview
     3.5  
     3.6  goat_root = ..
     3.7 -libgoat = $(goat_root)/libgoat3d.so.0.1
     3.8  
     3.9  CC = clang
    3.10  CPP = clang -E
    3.11  CFLAGS = -pedantic -Wall -g -I$(goat_root)/src
    3.12 -LDFLAGS = $(libgoat) -Wl,-rpath=$(goat_root) $(libgl)
    3.13 +LDFLAGS = $(libgoat) $(libgl)
    3.14  
    3.15  ifeq ($(shell uname -s), Darwin)
    3.16  	libgl = -framework OpenGL -framework GLUT -lGLEW
    3.17 +	libgoat = $(goat_root)/libgoat3d.dylib
    3.18  else
    3.19  	libgl = -lGL -lGLU -lglut -lGLEW
    3.20 +	libgoat = $(goat_root)/libgoat3d.so.0.1 -Wl,-rpath=$(goat_root) 
    3.21  endif
    3.22  
    3.23  $(bin): $(obj) $(libgoat)