cleanup

[blank.git] / Makefile

diff --git a/Makefile b/Makefile
index e6e24d9d2845caea6a24b673c9752d48bbeeda00..dd67f8ff6fc9e2bed18b145743a32f0274a7b256 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,11 +12,12 @@ CPPFLAGS ?=
 CPPFLAGS += $(PKGFLAGS)
 CXXFLAGS ?=
 CXXFLAGS += -Wall
+#CXXFLAGS += -march=native
 LDXXFLAGS ?=
 LDXXFLAGS += $(PKGLIBS)
 
 DEBUG_FLAGS = -g3 -O0
-PROFILE_FLAGS = -DNDEBUG -O1 -g3
+PROFILE_FLAGS = -DNDEBUG -O1 -g3 -DBLANK_PROFILING
 RELEASE_FLAGS = -DNDEBUG -O2 -g1
 TEST_FLAGS = -g -O2 -I./src $(TESTFLAGS)
 
@@ -36,8 +37,11 @@ BIN_SRC := $(wildcard $(SOURCE_DIR)/*.cpp)
 SRC := $(LIB_SRC) $(BIN_SRC)
 TEST_SRC := $(wildcard $(TEST_SRC_DIR)/*.cpp) $(wildcard $(TEST_SRC_DIR)/*/*.cpp)
 RELEASE_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(RELEASE_DIR)/%.o, $(SRC))
+RELEASE_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(RELEASE_DIR)/%.o, $(LIB_SRC))
 DEBUG_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(DEBUG_DIR)/%.o, $(SRC))
+DEBUG_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(DEBUG_DIR)/%.o, $(LIB_SRC))
 PROFILE_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(PROFILE_DIR)/%.o, $(SRC))
+PROFILE_LIB_OBJ := $(patsubst $(SOURCE_DIR)/%.cpp, $(PROFILE_DIR)/%.o, $(LIB_SRC))
 TEST_OBJ := $(patsubst $(TEST_SRC_DIR)/%.cpp, $(TEST_DIR)/%.o, $(TEST_SRC)) $(patsubst $(SOURCE_DIR)/%.cpp, $(TEST_DIR)/src/%.o, $(LIB_SRC))
 RELEASE_DEP := $(RELEASE_OBJ:.o=.d)
 DEBUG_DEP := $(DEBUG_OBJ:.o=.d)
@@ -45,7 +49,7 @@ PROFILE_DEP := $(PROFILE_OBJ:.o=.d)
 TEST_DEP := $(TEST_OBJ:.o=.d)
 RELEASE_BIN := blank
 DEBUG_BIN := blank.debug
-PROFILE_BIN := blank.profile
+PROFILE_BIN := blank.profile generate.profile
 TEST_BIN := blank.test
 OBJ := $(RELEASE_OBJ) $(DEBUG_OBJ) $(PROFILE_OBJ) $(TEST_OBJ)
 DEP := $(RELEASE_DEP) $(DEBUG_DEP) $(PROFILE_DEP) $(TEST_DEP)
@@ -67,6 +71,9 @@ run: $(ASSET_DEP) blank
 server: $(ASSET_DEP) blank
        ./blank --server --save-path saves/
 
+client: $(ASSET_DEP) blank
+       ./blank --client --save-path saves/
+
 gdb: $(ASSET_DEP) blank.debug
        gdb ./blank.debug
 
@@ -75,34 +82,37 @@ cachegrind: $(ASSET_DEP) blank.profile
 
 callgrind: $(ASSET_DEP) blank.profile
        valgrind --tool=callgrind \
+               --collect-atstart=no --toggle-collect="blank::Runtime::RunStandalone()" \
                --branch-sim=yes --cacheuse=yes --cache-sim=yes \
                --collect-bus=yes --collect-systime=yes --collect-jumps=yes \
                --dump-instr=yes --simulate-hwpref=yes --simulate-wb=yes \
-               ./blank.profile -n 128 -t 16 --no-keyboard --no-mouse -d --no-vsync --save-path saves/
+               ./blank.profile -n 256 -t 16 --no-keyboard --no-mouse -d --no-vsync --save-path saves/
 
 test: blank.test
        ./blank.test
 
 clean:
-       rm -df $(OBJ) $(DEP) $(DIR)
+       rm -f $(OBJ)
+       rm -f $(DEP)
+       find build -type d -empty -delete
 
 distclean: clean
        rm -f $(BIN) cachegrind.out.* callgrind.out.*
-       rm -Rf build saves
+       rm -Rf build client-saves saves
 
 .PHONY: all release debug profile tests run gdb cachegrind callgrind test clean distclean
 
 -include $(DEP)
 
-$(RELEASE_BIN): $(RELEASE_OBJ)
+$(RELEASE_BIN): %: $(RELEASE_DIR)/%.o $(RELEASE_LIB_OBJ)
        @echo link: $@
        @$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(RELEASE_FLAGS) $^
 
-$(DEBUG_BIN): $(DEBUG_OBJ)
+$(DEBUG_BIN): %.debug: $(DEBUG_DIR)/%.o $(DEBUG_LIB_OBJ)
        @echo link: $@
        @$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(DEBUG_FLAGS) $^
 
-$(PROFILE_BIN): $(PROFILE_OBJ)
+$(PROFILE_BIN): %.profile: $(PROFILE_DIR)/%.o $(PROFILE_LIB_OBJ)
        @echo link: $@
        @$(LDXX) -o $@ $(CXXFLAGS) $(LDXXFLAGS) $(PROFILE_FLAGS) $^