X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=Makefile;h=8b14f606f2d8f7faed00ded26d7bc211b2c87e49;hb=f4729fcfcf6f4802dd2439aa23dc3a4faf39827d;hp=312849578c4fcc86c434e97544350deda77acc02;hpb=f6e33d9f79ff6a47c3efa3c9fb1206cc1d27ecde;p=blank.git

diff --git a/Makefile b/Makefile
index 3128495..8b14f60 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,16 @@ 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_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(COVER_DIR)/src/%.o, $(LIB_SRC))
+COVER_TEST_LIB_OBJ := $(patsubst $(TEST_SRC_DIR)/%.cpp, $(COVER_DIR)/%.o, $(TEST_LIB_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_TEST_BIN := test.cover
 
 DEBUG_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(DEBUG_DIR)/%.o, $(SRC))
 DEBUG_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(DEBUG_DIR)/%.o, $(LIB_SRC))
@@ -80,13 +88,16 @@ RELEASE_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(RELEASE_DIR)/%.o, $(LIB_SRC
 RELEASE_DEP := $(RELEASE_OBJ:.o=.d)
 RELEASE_BIN := blank
 
+TEST_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(TEST_DIR)/src/%.o, $(LIB_SRC))
+TEST_TEST_LIB_OBJ := $(patsubst $(TEST_SRC_DIR)/%.cpp, $(TEST_DIR)/%.o, $(TEST_LIB_SRC))
 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_TEST_BIN := test.test
 
 OBJ := $(COVER_OBJ) $(DEBUG_OBJ) $(PROFILE_OBJ) $(RELEASE_OBJ) $(TEST_OBJ)
 DEP := $(COVER_DEP) $(DEBUG_DEP) $(PROFILE_DEP) $(RELEASE_DEP) $(TEST_DEP)
-BIN := $(COVER_BIN) $(DEBUG_BIN) $(PROFILE_BIN) $(RELEASE_BIN) $(TEST_BIN)
+BIN := $(COVER_BIN) $(DEBUG_BIN) $(PROFILE_BIN) $(RELEASE_BIN) $(TEST_BIN) $(COVER_TEST_BIN) $(TEST_TEST_BIN)
 
 release: $(RELEASE_BIN)
 
@@ -108,13 +119,13 @@ info:
 
 all: $(BIN)
 
-cover: $(COVER_BIN)
+cover: $(COVER_BIN) $(COVER_TEST_BIN)
 
 debug: $(DEBUG_BIN)
 
 profile: $(PROFILE_BIN)
 
-tests: $(TEST_BIN)
+tests: $(TEST_BIN) $(TEST_TEST_BIN)
 
 run: $(ASSET_DEP) blank
 	./blank --save-path saves/
@@ -139,18 +150,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) $(TEST_TEST_BIN)
+	@echo run: test.test
+	@./test.test
 
-coverage: blank.cover
-	@echo run: blank.cover
-	@./blank.cover
+coverage: $(COVER_BIN) $(COVER_TEST_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,12 +177,16 @@ 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)
+$(COVER_BIN): %.cover: $(COVER_DIR)/src/%.o $(COVER_LIB_OBJ)
+	@echo link: $@
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(COVER_FLAGS)
+
+$(COVER_TEST_BIN): %.cover: $(COVER_DIR)/%.o $(COVER_LIB_OBJ) $(COVER_TEST_LIB_OBJ)
 	@echo link: $@
 	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(TESTLIBS) $(COVER_FLAGS)
 
@@ -210,7 +231,11 @@ $(RELEASE_DIR)/%.o: $(SOURCE_DIR)/%.cpp | $(RELEASE_DIR)
 	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(RELEASE_FLAGS) -o $@ -MMD -MP -MF"$(@:.o=.d)" -MT"$@" $<
 
 
-$(TEST_BIN): $(TEST_OBJ)
+$(TEST_BIN): %.test: $(TEST_DIR)/src/%.o $(TEST_LIB_OBJ)
+	@echo link: $@
+	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(TEST_FLAGS)
+
+$(TEST_TEST_BIN): %.test: $(TEST_DIR)/%.o $(TEST_LIB_OBJ) $(TEST_TEST_LIB_OBJ)
 	@echo link: $@
 	@$(LDXX) $(CXXFLAGS) $^ -o $@ $(LDXXFLAGS) $(TESTLIBS) $(TEST_FLAGS)
 
@@ -225,7 +250,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 $@