conworlds

diff Makefile @ 20:782ff06817fb

merged ...
author John Tsiombikas <nuclear@member.fsf.org>
date Tue, 26 Aug 2014 18:42:53 +0300
parents 283cdfa7dda2
children 2da585428507
line diff
     1.1 --- a/Makefile	Tue Aug 26 18:40:23 2014 +0300
     1.2 +++ b/Makefile	Tue Aug 26 18:42:53 2014 +0300
     1.3 @@ -11,13 +11,13 @@
     1.4  ohmd_cflags = -DUSE_OPENHMD
     1.5  ohmd_libs = -lopenhmd
     1.6  
     1.7 -CFLAGS = -pedantic -Wall -g $(ovr_cflags)
     1.8 +CFLAGS = -pedantic -Wall -g $(ovr_cflags) `pkg-config --cflags sdl2`
     1.9  CXXFLAGS = -std=c++11 $(CFLAGS)
    1.10 -LDFLAGS = $(libgl_$(sys)) -lm -lvmath -limago -lanim $(ovr_libs)
    1.11 +LDFLAGS = $(libgl_$(sys)) -lm -lvmath -limago -lanim $(ovr_libs) `pkg-config --libs sdl2`
    1.12  
    1.13 -libgl_unix = -lGL -lGLU -lglut -lGLEW
    1.14 -libgl_mac = -framework OpenGL -framework GLUT -lGLEW
    1.15 -libgl_win = -lopengl32 -lglu32 -lglut32 -lglew32
    1.16 +libgl_unix = -lGL -lGLU -lGLEW
    1.17 +libgl_mac = -framework OpenGL -lGLEW
    1.18 +libgl_win = -lopengl32 -lglu32 -lglew32
    1.19  
    1.20  $(bin): $(obj)
    1.21  	$(CXX) -o $@ $(obj) $(LDFLAGS)