Fixed implicit method; some refactoring
This commit is contained in:
parent
66093b4858
commit
584bcb94d1
5 changed files with 80 additions and 73 deletions
20
Makefile
20
Makefile
|
|
@ -1,14 +1,16 @@
|
|||
SRC_DIR = src
|
||||
RELEASE_DIR = build/release
|
||||
DEBUG_DIR = build/debug
|
||||
BINARY = stj
|
||||
SRC_DIR := src
|
||||
BUILD_DIR := build
|
||||
RELEASE_DIR := $(BUILD_DIR)/release
|
||||
DEBUG_DIR := $(BUILD_DIR)/debug
|
||||
BINARY := stj
|
||||
CORES := $(shell nproc --all)
|
||||
|
||||
all: debug
|
||||
.PHONY: all
|
||||
|
||||
|
||||
clean:
|
||||
@ rm -rf build
|
||||
@ rm -rf $(BUILD_DIR)
|
||||
.PHONY: clean
|
||||
|
||||
|
||||
|
|
@ -18,14 +20,14 @@ run-release: release
|
|||
.PHONY: run-release
|
||||
|
||||
release: $(RELEASE_DIR)/Makefile
|
||||
@ make -C $(RELEASE_DIR)
|
||||
@ make -C $(RELEASE_DIR) -j$(CORES)
|
||||
.PHONY: release
|
||||
|
||||
$(RELEASE_DIR)/Makefile: $(SRC_DIR)/CMakeLists.txt
|
||||
@ cmake -H$(SRC_DIR) -B$(RELEASE_DIR) -DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
clean-release:
|
||||
@ rm -rf build/release
|
||||
@ rm -rf $(RELEASE_DIR)
|
||||
.PHONY: clean-release
|
||||
|
||||
|
||||
|
|
@ -35,12 +37,12 @@ run-debug: debug
|
|||
.PHONY: run-debug
|
||||
|
||||
debug: $(DEBUG_DIR)/Makefile
|
||||
@ make -C $(DEBUG_DIR)
|
||||
@ make -C $(DEBUG_DIR) -j$(CORES)
|
||||
.PHONY: debug
|
||||
|
||||
$(DEBUG_DIR)/Makefile: $(SRC_DIR)/CMakeLists.txt
|
||||
@ cmake -H$(SRC_DIR) -B$(DEBUG_DIR) -DCMAKE_BUILD_TYPE=Debug
|
||||
|
||||
clean-debug:
|
||||
@ rm -rf build/debug
|
||||
@ rm -rf $(DEBUG_DIR)
|
||||
.PHONY: clean-debug
|
||||
|
|
|
|||
Reference in a new issue