somewhat self-cleaning temp dir

[blank.git] / Makefile

diff --git a/Makefile b/Makefile
index 2fb2f20b44f2cc4e30ed376798c280b14227d37e..188f4333082ebdbd6d7862ca9a15751fb3e7f82b 100644 (file)
--- 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,7 +171,7 @@ 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)