changeset 34:c0b85b0615d2

Improve the makefiles.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 26 Nov 2019 07:17:49 +0200
parents 2e85c180afdf
children d0cd281934a3
files Makefile Makefile.gen
diffstat 2 files changed, 27 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Nov 22 23:11:02 2019 +0200
+++ b/Makefile	Tue Nov 26 07:17:49 2019 +0200
@@ -1,31 +1,9 @@
 BINEXT ?= 
-CFLAGS ?= -O3 -W -Wall -DGL_GLEXT_PROTOTYPES -std=c++11
-LDFLAGS ?= 
 
-SDL2_CFLAGS ?= $(shell pkg-config --cflags sdl2)
-SDL2_LIBS ?= $(shell pkg-config --libs sdl2)
+SDL_CFLAGS ?= $(shell pkg-config --cflags sdl2)
+SDL_LDFLAGS ?= $(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) ply2bin$(BINEXT)
-
-all: $(TARGETS)
-
-%.o: %.cpp %.h
-	$(CXX) $(CFLAGS) -c -o $@ $<
+GL_LDFLAGS ?= $(shell pkg-config --libs gl glu)
 
-%.o: %.cpp
-	$(CXX) $(CFLAGS) -c -o $@ $<
-
-
-gldragon$(BINEXT): gldragon.o dmmodel.o dmutil.o
-	$(CXX) -o $@ $+ $(LDFLAGS) $(SDL2_LIBS) $(GL_LIBS)
-
-ply2bin$(BINEXT): ply2bin.o dmmodel.o dmutil.o
-	$(CXX) -o $@ $+ $(LDFLAGS)
-
-clean:
-	$(RM) $(TARGETS) *.o
+include Makefile.gen
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.gen	Tue Nov 26 07:17:49 2019 +0200
@@ -0,0 +1,23 @@
+CFLAGS ?= -O3 -W -Wall -DGL_GLEXT_PROTOTYPES -std=c++11
+LDFLAGS ?= 
+CFLAGS += $(SDL_CFLAGS) $(GL_CFLAGS)
+
+TARGETS = gldragon$(BINEXT) ply2bin$(BINEXT)
+
+all: $(TARGETS)
+
+%.o: %.cpp %.h
+	$(CXX) $(CFLAGS) -c -o $@ $<
+
+%.o: %.cpp
+	$(CXX) $(CFLAGS) -c -o $@ $<
+
+
+gldragon$(BINEXT): gldragon.o dmmodel.o dmutil.o
+	$(CXX) -o $@ $+ $(LDFLAGS) $(SDL_LDFLAGS) $(GL_LDFLAGS)
+
+ply2bin$(BINEXT): ply2bin.o dmmodel.o dmutil.o
+	$(CXX) -o $@ $+ $(LDFLAGS)
+
+clean:
+	$(RM) $(TARGETS) *.o