mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-01 23:36:00 +00:00
changes
This commit is contained in:
parent
415604059b
commit
11ef236b8d
1 changed files with 13 additions and 2 deletions
15
Makefile
15
Makefile
|
@ -10,13 +10,24 @@ NON_MATCHING ?= 0
|
||||||
ORIG_COMPILER ?= 0
|
ORIG_COMPILER ?= 0
|
||||||
# If COMPILER is GCC, compile with GCC instead of IDO.
|
# If COMPILER is GCC, compile with GCC instead of IDO.
|
||||||
COMPILER ?= ido
|
COMPILER ?= ido
|
||||||
|
# Declare ZAPDFLAGS used for ZAPD's flags.
|
||||||
|
ZAPDFLAGS ?=
|
||||||
|
# Declare CPPFLAGS used for the preprocessor.
|
||||||
|
CPPFLAGS ?=
|
||||||
|
|
||||||
|
# ORIG_COMPILER cannot be combined with a non-IDO compiler. Check for this case and error out if found.
|
||||||
|
ifneq ($(COMPILER),ido)
|
||||||
|
ifeq ($(ORIG_COMPILER),1)
|
||||||
|
$(error ORIG_COMPILER cannot be enabled with IDO not being the compiler. Please check your Makefile variables and try again.)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# If gcc is used, define the NON_MATCHING flag respectively so the files that
|
# If gcc is used, define the NON_MATCHING flag respectively so the files that
|
||||||
# are safe to be used can avoid using GLOBAL_ASM which doesn't work with gcc.
|
# are safe to be used can avoid using GLOBAL_ASM which doesn't work with gcc.
|
||||||
ifeq ($(COMPILER),gcc)
|
ifeq ($(COMPILER),gcc)
|
||||||
|
CPPFLAGS += -DCOMPILER_GCC
|
||||||
|
ZAPDFLAGS += --gcc-compat
|
||||||
NON_MATCHING := 1
|
NON_MATCHING := 1
|
||||||
CPPFLAGS := -DCOMPILER_GCC
|
|
||||||
ZAPDFLAGS := --gcc-compat
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(NON_MATCHING),1)
|
ifeq ($(NON_MATCHING),1)
|
||||||
|
|
Loading…
Reference in a new issue