# HG changeset patch # User John Tsiombikas # Date 1402140116 -10800 # Node ID 2c768a49e86e15bb4c6f18c413d4a511b83f71f1 # Parent b1fc96c71bcc3a7fa5c444aac0d014411a90978b - added -ldrawtext to the makefile - removed -rpath from osx build diff -r b1fc96c71bcc -r 2c768a49e86e Makefile --- a/Makefile Sat Jun 07 13:36:36 2014 +0300 +++ b/Makefile Sat Jun 07 14:21:56 2014 +0300 @@ -3,9 +3,13 @@ obj = $(csrc:.c=.o) $(ccsrc:.cc=.o) bin = erebus -CFLAGS = -pedantic -Wall -g -Iliberebus/src +opt = -O3 -ffast-math +dbg = -g +warn = -Wall + +CFLAGS = -pedantic $(warn) $(opt) $(dbg) -Iliberebus/src CXXFLAGS = -std=c++11 $(CFLAGS) -LDFLAGS = -Lliberebus -Wl,-rpath=liberebus $(libgl_$(sys)) -lm -lerebus -lvmath -limago +LDFLAGS = -Lliberebus $(rpath) $(libgl_$(sys)) -lm -lerebus -lvmath -limago -ldrawtext libgl_unix = -lGL -lGLU -lglut -lGLEW libgl_mac = -framework OpenGL -framework GLUT -lGLEW @@ -25,8 +29,10 @@ uname = $(shell uname -s) ifeq ($(uname), Darwin) sys = mac + warn += -Wno-deprecated-declarations else ifeq ($(findstring MINGW, $(uname)), MINGW) sys = win else sys = unix + rpath = -Wl,-rpath=liberebus endif