From 80c072533236a14f96a6e9b30a23c8b80bda9445 Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 19 Sep 2016 18:42:03 +0300 Subject: [PATCH 1/2] fixed building for macOS --- project/makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/project/makefile b/project/makefile index d8045fe..fada463 100644 --- a/project/makefile +++ b/project/makefile @@ -109,17 +109,17 @@ release: mkdir -p release $(MAKE) main DEBUG=false -release_osx: +release_macos: mkdir -p release - $(MAKE) main OSX=true DEBUG=false + $(MAKE) main MAC=true DEBUG=false -debug_osx: +debug_macos: mkdir -p debug - $(MAKE) main OSX=true DEBUG=true + $(MAKE) main MAC=true DEBUG=true all_linux: release debug -all_osx: release_osx debug_osx -all: all_linux all_osx +all_macos: release_macos debug_macos +all: all_linux all_macos default: all From 5c3f0415b19b74216120869fd5a02187c51be12b Mon Sep 17 00:00:00 2001 From: jeefo Date: Mon, 19 Sep 2016 19:05:47 +0300 Subject: [PATCH 2/2] more fixes --- project/makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/makefile b/project/makefile index fada463..8e74523 100644 --- a/project/makefile +++ b/project/makefile @@ -94,8 +94,6 @@ $(BIN_DIR)/%.o: %.cpp $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $(subst $(SRC_DIR)/,,$@) -c $< main: - mkdir -p release - mkdir -p debug $(MAKE) $(PROJECT) $(PROJECT): $(OBJ_BIN)