erebus

changeset 33:2c768a49e86e

find changesets by author, revision, files, or words in the commit message
- added -ldrawtext to the makefile - removed -rpath from osx build
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 07 Jun 2014 14:21:56 +0300
parents b1fc96c71bcc
children d15ee526daa6
files Makefile
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/Makefile	Sat Jun 07 13:36:36 2014 +0300
     1.2 +++ b/Makefile	Sat Jun 07 14:21:56 2014 +0300
     1.3 @@ -3,9 +3,13 @@
     1.4  obj = $(csrc:.c=.o) $(ccsrc:.cc=.o)
     1.5  bin = erebus
     1.6  
     1.7 -CFLAGS = -pedantic -Wall -g -Iliberebus/src
     1.8 +opt = -O3 -ffast-math
     1.9 +dbg = -g
    1.10 +warn = -Wall
    1.11 +
    1.12 +CFLAGS = -pedantic $(warn) $(opt) $(dbg) -Iliberebus/src
    1.13  CXXFLAGS = -std=c++11 $(CFLAGS)
    1.14 -LDFLAGS = -Lliberebus -Wl,-rpath=liberebus $(libgl_$(sys)) -lm -lerebus -lvmath -limago
    1.15 +LDFLAGS = -Lliberebus $(rpath) $(libgl_$(sys)) -lm -lerebus -lvmath -limago -ldrawtext
    1.16  
    1.17  libgl_unix = -lGL -lGLU -lglut -lGLEW
    1.18  libgl_mac = -framework OpenGL -framework GLUT -lGLEW
    1.19 @@ -25,8 +29,10 @@
    1.20  uname = $(shell uname -s)
    1.21  ifeq ($(uname), Darwin)
    1.22  	sys = mac
    1.23 +	warn += -Wno-deprecated-declarations
    1.24  else ifeq ($(findstring MINGW, $(uname)), MINGW)
    1.25  	sys = win
    1.26  else
    1.27  	sys = unix
    1.28 +	rpath = -Wl,-rpath=liberebus
    1.29  endif