markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed cross-tool references from makefile.

Browse source
This commit is contained in:
jeefo 2018-07-31 00:06:06 +03:00 • committed by GitHub
commit cae3b3cc88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
project/makefile
View file

@ -32,10 +32,10 @@ INCLUDE = -I../include -I../include/engine
COMPILER = $(CC) COMPILER = $(CC)
ifeq "$(shell uname -s)" "Darwin" ifeq "$(shell uname -s)" "Darwin"
MACOS = true OSX = true
endif endif
ifeq "$(MACOS)" "true" ifeq "$(OSX)" "true"
LIBRARY_EXT = dylib LIBRARY_EXT = dylib
COMPILER_FLAGS += -DOSX -D_OSX -DPOSIX COMPILER_FLAGS += -DOSX -D_OSX -DPOSIX
LINKER_FLAGS += -dynamiclib -lstdc++ -mmacosx-version-min=10.5 -arch i386 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) ifeq ($(findstring clang,$(COMPILER)),clang)
COMPILER_FLAGS += -D__extern_always_inline="extern __always_inline" COMPILER_FLAGS += -D__extern_always_inline="extern __always_inline"
ifeq "$(MACOS)" "false" ifeq "$(OSX)" "false"
LINKER_FLAGS += -lgcc_eh LINKER_FLAGS += -lgcc_eh
endif endif
else ifeq ($(findstring gcc,$(COMPILER)),gcc) else ifeq ($(findstring gcc,$(COMPILER)),gcc)
ifneq "$(MACOS)" "false" ifneq "$(OSX)" "false"
LINKER_FLAGS += -static-libgcc LINKER_FLAGS += -static-libgcc
COMPILER_FLAGS += -funroll-all-loops COMPILER_FLAGS += -funroll-all-loops
endif endif
@ -82,23 +82,9 @@ release:
debug: debug:
$(MAKE) compile DEBUG=true $(MAKE) compile DEBUG=true
release_macos: all:
$(MAKE) compile MACOS=true DEBUG=false
debug_macos:
$(MAKE) compile MACOS=true DEBUG=true
all_linux:
$(MAKE) compile DEBUG=true $(MAKE) compile DEBUG=true
$(MAKE) compile DEBUG=false $(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: clean:
rm -rf release/*.o rm -rf release/*.o
rm -rf release/$(BINARY_OUTPUT) rm -rf release/$(BINARY_OUTPUT)