# HG changeset patch # User John Tsiombikas # Date 1400330530 -10800 # Node ID f92da4fa9a6d92963593b1654f25921ed7b9c59e # Parent 8b156bc5205bc08c2daa9aebfcce4a7e92d597b0 fixed for macosx diff -r 8b156bc5205b -r f92da4fa9a6d goatview/Makefile --- a/goatview/Makefile Sat May 17 06:26:24 2014 +0300 +++ b/goatview/Makefile Sat May 17 15:42:10 2014 +0300 @@ -10,7 +10,9 @@ goat_root = .. -CFLAGS = -Wall -Wno-cpp -g $(pic) -I$(goat_root)/src $(qtinc) +warn = -Wall + +CFLAGS = $(warn) -g $(pic) -I$(goat_root)/src $(qtinc) CXXFLAGS = -std=c++11 $(CFLAGS) LDFLAGS = $(libgoat) $(libgl) $(qtlib) -lvmath MOC = moc @@ -21,12 +23,20 @@ ifeq ($(shell uname -s), Darwin) libgl = -framework OpenGL -framework GLUT -lGLEW libgoat = $(goat_root)/libgoat3d.dylib + warn += -Wno-deprecated-declarations else pic = -fPIC libgl = -lGL -lGLU -lglut -lGLEW libgoat = $(goat_root)/libgoat3d.so.0.1 endif +ifeq ($(CC), gcc) + warn += -Wno-cpp +endif +ifneq ($(shell $(CC) --version | grep LLVM),) + CXXFLAGS += -stdlib=libc++ +endif + $(bin): $(obj) $(libgoat) $(CXX) -o $@ $(obj) $(LDFLAGS)