Merge branch 'master' of ssh://ka.blankertz.org/home/matthias/git/openglplayground

This commit is contained in:
2015-02-13 16:01:07 +01:00
19 changed files with 955 additions and 471 deletions

View File

@@ -1,12 +1,14 @@
CXX=g++
CXXOPTS=-Og -ggdb -Wall -Wextra -pedantic -Wno-unused-function -Wno-unused-parameter -Wno-sign-compare -std=c++11
LDOPTS=-flto
LIBS=-lglbinding -lSDL2 -lSDL2_image -lobj -lprotobuf
CXXSRCS=main.cc objectParser.cc object.pb.cc
CXXOPTS=-O2 -ggdb -Wall -Wextra -pedantic -Wno-unused-function -Wno-unused-parameter -Wno-sign-compare -std=c++14 -flto
LDOPTS=
LIBS=-lglbinding -lSDL2 -lSDL2_image -lobj -lSDL2_ttf -lprotobuf
CXXSRCS=main.cc objectParser.cc shaders.cc Object.cc VBOManager.cc texture.cc font.cc Overlay.cc
BINIFY_SRCS=binifyObj.cc objectParser.cc object.pb.cc
OBJS=$(addprefix objs/,$(CXXSRCS:.cc=.o))
BINIFY_OBJS=$(addprefix objs/,$(BINIFY_SRCS:.cc=.o))
all: oglpg binifyObj
objs/%.o: %.cc
$(CXX) $(CXXOPTS) -c -MMD -MP -o $@ $<
@cp objs/$*.d objs/$*.P; rm -f objs/$*.d
@@ -23,7 +25,7 @@ binifyObj: $(BINIFY_OBJS)
clean:
rm -f oglpg $(OBJS) $(BINIFY_OBJS) $(addprefix objs/,$(CXXSRCS:.cc=.P)) $(addprefix objs/,$(BINIFY_SRCS:.cc=.P))
.PHONY: clean
.PHONY: clean all
-include $(addprefix objs/,$(CXXSRCS:.cc=.P))
-include $(addprefix objs/,$(BINIFY_SRCS:.cc=.P))