X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=Makefile;h=188f4333082ebdbd6d7862ca9a15751fb3e7f82b;hb=ab5d0b96a74b0d8fb33a89c097ff9c7021349f56;hp=55b93ba0b9e709f327d52a3a56f2815b5d15d79d;hpb=4adb14f5ed0c5322ded3cd94e45485b8f12557fa;p=blank.git

diff --git a/Makefile b/Makefile
index 55b93ba..188f433 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 CXX = g++ --std=c++11
 LDXX = g++
+CPPCHECK = cppcheck -q --std=c++11 \
+	--enable=warning,style,performance,portability,unusedFunction,missingInclude \
+	--error-exitcode=1
 
 LIBS = sdl2 SDL2_image SDL2_net SDL2_ttf glew openal freealut zlib
 
@@ -11,7 +14,7 @@ TESTLIBS := $(shell pkg-config --libs cppunit)
 CPPFLAGS ?=
 CPPFLAGS += $(PKGFLAGS)
 CXXFLAGS ?=
-CXXFLAGS += -Wall
+CXXFLAGS += -Wall -Wextra -Werror
 #CXXFLAGS += -march=native
 LDXXFLAGS ?=
 LDXXFLAGS += $(PKGLIBS)
@@ -38,11 +41,11 @@ TEST_SRC_DIR := tst
 #   same flags as release, but with main replaced by cppunit
 #   test runner and tests (from tst dir) built in
 
-COVER_FLAGS = -g -O0 --coverage -I$(SOURCE_DIR) $(TESTFLAGS)
+COVER_FLAGS = -g -O0 --coverage -I$(SOURCE_DIR) $(TESTFLAGS) -DBLANK_SUFFIX=.cover
 DEBUG_FLAGS = -g3 -O0
 PROFILE_FLAGS = -DNDEBUG -O1 -g3 -DBLANK_PROFILING
 RELEASE_FLAGS = -DNDEBUG -O2 -g1
-TEST_FLAGS = -g -O2 -I$(SOURCE_DIR) $(TESTFLAGS)
+TEST_FLAGS = -g -O2 -I$(SOURCE_DIR) $(TESTFLAGS) -DBLANK_SUFFIX=.test
 
 # destination
 COVER_DIR := build/cover
@@ -59,11 +62,13 @@ ASSET_DEP := $(ASSET_DIR)/.git
 LIB_SRC := $(wildcard $(SOURCE_DIR)/*/*.cpp)
 BIN_SRC := $(wildcard $(SOURCE_DIR)/*.cpp)
 SRC := $(LIB_SRC) $(BIN_SRC)
-TEST_SRC := $(wildcard $(TEST_SRC_DIR)/*.cpp) $(wildcard $(TEST_SRC_DIR)/*/*.cpp)
+TEST_BIN_SRC := $(wildcard $(TEST_SRC_DIR)/*.cpp)
+TEST_LIB_SRC := $(wildcard $(TEST_SRC_DIR)/*/*.cpp)
+TEST_SRC := $(TEST_LIB_SRC) $(TEST_BIN_SRC)
 
 COVER_OBJ := $(patsubst $(TEST_SRC_DIR)/%.cpp, $(COVER_DIR)/%.o, $(TEST_SRC)) $(patsubst $(SOURCE_DIR)/%.cpp, $(COVER_DIR)/src/%.o, $(LIB_SRC))
 COVER_DEP := $(COVER_OBJ:.o=.d)
-COVER_BIN := blank.cover
+COVER_BIN := blank.cover test.cover
 
 DEBUG_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(DEBUG_DIR)/%.o, $(SRC))
 DEBUG_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(DEBUG_DIR)/%.o, $(LIB_SRC))
@@ -82,7 +87,7 @@ RELEASE_BIN := blank
 
 TEST_OBJ := $(patsubst $(TEST_SRC_DIR)/%.cpp, $(TEST_DIR)/%.o, $(TEST_SRC)) $(patsubst $(SOURCE_DIR)/%.cpp, $(TEST_DIR)/src/%.o, $(LIB_SRC))
 TEST_DEP := $(TEST_OBJ:.o=.d)
-TEST_BIN := blank.test
+TEST_BIN := blank.test test.test
 
 OBJ := $(COVER_OBJ) $(DEBUG_OBJ) $(PROFILE_OBJ) $(RELEASE_OBJ) $(TEST_OBJ)
 DEP := $(COVER_DEP) $(DEBUG_DEP) $(PROFILE_DEP) $(RELEASE_DEP) $(TEST_DEP)
@@ -139,18 +144,24 @@ callgrind: $(ASSET_DEP) blank.profile
 		--dump-instr=yes --simulate-hwpref=yes --simulate-wb=yes \
 		./blank.profile -n 256 -t 16 --no-keyboard --no-mouse -d --no-vsync --save-path saves/
 
-test: blank.test
-	@echo run: blank.test
-	@./blank.test
+test: $(TEST_BIN)
+	@echo run: test.test
+	@./test.test
 
-coverage: blank.cover
-	@echo run: blank.cover
-	@./blank.cover
+coverage: $(COVER_BIN)
+	@echo run: test.cover
+	@./test.cover
 
 codecov: coverage
 	@echo run: codecov.io
 	@bash -c 'bash <(curl -s https://codecov.io/bash) -Z'
 
+lint:
+	@echo lint: source
+	@$(CPPCHECK) $(SOURCE_DIR)
+	@echo lint: tests
+	@$(CPPCHECK) -I $(SOURCE_DIR) $(TEST_SRC_DIR)
+
 clean:
 	rm -f $(OBJ)
 	rm -f $(DEP)
@@ -160,14 +171,14 @@ distclean: clean
 	rm -f $(BIN) cachegrind.out.* callgrind.out.*
 	rm -Rf build client-saves saves
 
-.PHONY: all release cover debug profile tests run gdb cachegrind callgrind test coverage codecov clean distclean
+.PHONY: all release cover debug profile tests run gdb cachegrind callgrind test coverage codecov lint clean distclean
 
 -include $(DEP)
 
 
 $(COVER_BIN): $(COVER_OBJ)
 	@echo link: $@
-	@$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(TESTLIBS) $(COVER_FLAGS) $^
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(TESTLIBS) $(COVER_FLAGS)
 
 $(COVER_DIR)/%.o: $(TEST_SRC_DIR)/%.cpp | $(COVER_DIR)
 	@mkdir -p "$(@D)"
@@ -182,7 +193,7 @@ $(COVER_DIR)/src/%.o: $(SOURCE_DIR)/%.cpp | $(COVER_DIR)
 
 $(DEBUG_BIN): %.debug: $(DEBUG_DIR)/%.o $(DEBUG_LIB_OBJ)
 	@echo link: $@
-	@$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(DEBUG_FLAGS) $^
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(DEBUG_FLAGS)
 
 $(DEBUG_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(DEBUG_DIR)
 	@mkdir -p "$(@D)"
@@ -192,7 +203,7 @@ $(DEBUG_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(DEBUG_DIR)
 
 $(PROFILE_BIN): %.profile: $(PROFILE_DIR)/%.o $(PROFILE_LIB_OBJ)
 	@echo link: $@
-	@$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(PROFILE_FLAGS) $^
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(PROFILE_FLAGS)
 
 $(PROFILE_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(PROFILE_DIR)
 	@mkdir -p "$(@D)"
@@ -202,7 +213,7 @@ $(PROFILE_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(PROFILE_DIR)
 
 $(RELEASE_BIN): %: $(RELEASE_DIR)/%.o $(RELEASE_LIB_OBJ)
 	@echo link: $@
-	@$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(RELEASE_FLAGS) $^
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(RELEASE_FLAGS)
 
 $(RELEASE_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(RELEASE_DIR)
 	@mkdir -p "$(@D)"
@@ -212,7 +223,7 @@ $(RELEASE_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(RELEASE_DIR)
 
 $(TEST_BIN): $(TEST_OBJ)
 	@echo link: $@
-	@$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(TESTLIBS) $(TEST_FLAGS) $^
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(TESTLIBS) $(TEST_FLAGS)
 
 $(TEST_DIR)/%.o: $(TEST_SRC_DIR)/%.cpp | $(TEST_DIR)
 	@mkdir -p "$(@D)"
@@ -225,7 +236,7 @@ $(TEST_DIR)/src/%.o: $(SOURCE_DIR)/%.cpp | $(TEST_DIR)
 	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(TEST_FLAGS) -o $@ -MMD -MP -MF"$(@:.o=.d)" -MT"$@" $<
 
 
-$(ASSET_DEP): .git/$(shell git symbolic-ref HEAD 2>/dev/null || echo .git/HEAD)
+$(ASSET_DEP): .git/$(shell git symbolic-ref HEAD 2>/dev/null || echo HEAD)
 	@echo fetch: assets
 	@git submodule update --init >/dev/null
 	@touch $@