diff --git a/project/makefile b/project/makefile index 7bc2dbc..1e0c874 100644 --- a/project/makefile +++ b/project/makefile @@ -32,10 +32,10 @@ INCLUDE = -I../include -I../include/engine COMPILER = $(CC) ifeq "$(shell uname -s)" "Darwin" - MACOS = true + OSX = true endif -ifeq "$(MACOS)" "true" +ifeq "$(OSX)" "true" LIBRARY_EXT = dylib COMPILER_FLAGS += -DOSX -D_OSX -DPOSIX LINKER_FLAGS += -dynamiclib -lstdc++ -mmacosx-version-min=10.5 -arch i386 @@ -49,11 +49,11 @@ BINARY_OUTPUT = $(PROJECT).$(LIBRARY_EXT) ifeq ($(findstring clang,$(COMPILER)),clang) COMPILER_FLAGS += -D__extern_always_inline="extern __always_inline" - ifeq "$(MACOS)" "false" + ifeq "$(OSX)" "false" LINKER_FLAGS += -lgcc_eh endif else ifeq ($(findstring gcc,$(COMPILER)),gcc) - ifneq "$(MACOS)" "false" + ifneq "$(OSX)" "false" LINKER_FLAGS += -static-libgcc COMPILER_FLAGS += -funroll-all-loops endif @@ -82,23 +82,9 @@ release: debug: $(MAKE) compile DEBUG=true -release_macos: - $(MAKE) compile MACOS=true DEBUG=false - -debug_macos: - $(MAKE) compile MACOS=true DEBUG=true - -all_linux: +all: $(MAKE) compile DEBUG=true $(MAKE) compile DEBUG=false - -all_macos: - $(MAKE) compile MACOS=true DEBUG=false - $(MAKE) compile MACOS=true DEBUG=true - -all: all_linux all_macos -default: all_linux - clean: rm -rf release/*.o rm -rf release/$(BINARY_OUTPUT)