Mercurial > hg > forks > gldragon

changeset 29:5c7f63fe5c19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up Makefile a bit.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 22 Nov 2019 09:28:23 +0200
parents d2839cbfaad8
children 1a0e823283e4
files Makefile
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Nov 22 08:39:48 2019 +0200
+++ b/Makefile	Fri Nov 22 09:28:23 2019 +0200
@@ -1,16 +1,18 @@
 BINEXT ?= 
-
-SDLGL_CFLAGS  ?= $(shell pkg-config --cflags sdl2 gl glu)
-SDLGL_LIBS ?= $(shell pkg-config --libs sdl2 gl glu)
-
 CFLAGS ?= -O3 -W -Wall -DGL_GLEXT_PROTOTYPES -std=c++11
 LDFLAGS ?= 
 
-CFLAGS += $(SDLGL_CFLAGS)
-LDFLAGS += $(SDLGL_LIBS)
+SDL2_CFLAGS ?= $(shell pkg-config --cflags sdl2)
+SDL2_LIBS ?= $(shell pkg-config --libs sdl2)
+
+GL_CFLAGS ?= $(shell pkg-config --cflags gl glu)
+GL_LIBS ?= $(shell pkg-config --libs gl glu)
+
+CFLAGS += $(SDL2_CFLAGS) $(GL_CFLAGS)
 
 TARGETS = gldragon$(BINEXT)
 
+all: $(TARGETS)
 
 %.o: %.cpp %.h
 	$(CXX) $(CFLAGS) -c -o $@ $<
@@ -20,7 +22,7 @@
 
 
 gldragon$(BINEXT): gldragon.o dmmodel.o dmutil.o
-	$(CXX) -o $@ $+ $(LDFLAGS)
+	$(CXX) -o $@ $+ $(LDFLAGS) $(SDL2_LIBS) $(GL_LIBS)
 
 clean:
 	$(RM) $(TARGETS) *.o