goat3d

changeset 91:f92da4fa9a6d

find changesets by author, revision, files, or words in the commit message
fixed for macosx
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 17 May 2014 15:42:10 +0300
parents 8b156bc5205b
children ae6c5941faac
files goatview/Makefile
diffstat 1 files changed, 11 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/goatview/Makefile	Sat May 17 06:26:24 2014 +0300
     1.2 +++ b/goatview/Makefile	Sat May 17 15:42:10 2014 +0300
     1.3 @@ -10,7 +10,9 @@
     1.4  
     1.5  goat_root = ..
     1.6  
     1.7 -CFLAGS = -Wall -Wno-cpp -g $(pic) -I$(goat_root)/src $(qtinc)
     1.8 +warn = -Wall
     1.9 +
    1.10 +CFLAGS = $(warn) -g $(pic) -I$(goat_root)/src $(qtinc)
    1.11  CXXFLAGS = -std=c++11 $(CFLAGS)
    1.12  LDFLAGS = $(libgoat) $(libgl) $(qtlib) -lvmath
    1.13  MOC = moc
    1.14 @@ -21,12 +23,20 @@
    1.15  ifeq ($(shell uname -s), Darwin)
    1.16  	libgl = -framework OpenGL -framework GLUT -lGLEW
    1.17  	libgoat = $(goat_root)/libgoat3d.dylib
    1.18 +	warn += -Wno-deprecated-declarations
    1.19  else
    1.20  	pic = -fPIC
    1.21  	libgl = -lGL -lGLU -lglut -lGLEW
    1.22  	libgoat = $(goat_root)/libgoat3d.so.0.1
    1.23  endif
    1.24  
    1.25 +ifeq ($(CC), gcc)
    1.26 +	warn += -Wno-cpp
    1.27 +endif
    1.28 +ifneq ($(shell $(CC) --version | grep LLVM),)
    1.29 +	CXXFLAGS += -stdlib=libc++
    1.30 +endif
    1.31 +
    1.32  $(bin): $(obj) $(libgoat)
    1.33  	$(CXX) -o $@ $(obj) $(LDFLAGS)
    1.34