dungeon_crawler
diff prototype/Makefile @ 25:527fede30057
- fixed sphere rendering (PointLight::draw)
- added config argument options
- fixed macosx compilation
| author | John Tsiombikas <nuclear@member.fsf.org> |
|---|---|
| date | Sat, 25 Aug 2012 02:16:08 +0300 |
| parents | e122ba214ee1 |
| children |
line diff
1.1 --- a/prototype/Makefile Thu Aug 23 18:03:11 2012 +0300 1.2 +++ b/prototype/Makefile Sat Aug 25 02:16:08 2012 +0300 1.3 @@ -11,10 +11,12 @@ 1.4 inc = -Ivmath -Idrawtext `pkg-config --cflags freetype2` 1.5 1.6 CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(inc) 1.7 -CXXFLAGS = $(CFLAGS) -std=c++11 1.8 -LDFLAGS = $(libgl) -lm -lassimp -limago `pkg-config --libs freetype2` 1.9 +CXXFLAGS = $(CFLAGS) -std=c++11 $(add_cxxflags) 1.10 +LDFLAGS = $(add_ldflags) $(libgl) -lm -lassimp -limago `pkg-config --libs freetype2` 1.11 1.12 ifeq ($(shell uname -s), Darwin) 1.13 + add_cxxflags = -stdlib=libc++ 1.14 + add_ldflags = -stdlib=libc++ 1.15 libgl = -framework OpenGL -framework GLUT -lglew 1.16 else 1.17 libgl = -lGL -lGLU -lglut -lGLEW