summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-12-16 21:16:55 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-12-16 21:16:55 -0500
commit32e566def07698121d5b2f56edb6867329326276 (patch)
tree6b85da1107d36ec37c33bbca7fd55a97d071db67
parent166183d5ed73059922b9679b832b591dd6fa073b (diff)
Don't define CPP until MODERN is defined.
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 891cab480..306b8fb6e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,6 @@ PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy
AS := $(PREFIX)as
-ifneq ($(MODERN),1)
-CPP := $(CC) -E
-else
-CPP := $(PREFIX)cpp
-endif
-
LD := $(PREFIX)ld
# note: the makefile must be set up so MODERNCC is never called
@@ -42,6 +36,12 @@ MAKER_CODE := 01
REVISION := 0
MODERN ?= 0
+ifneq ($(MODERN),1)
+CPP := $(CC) -E
+else
+CPP := $(PREFIX)cpp
+endif
+
ROM_NAME := pokeemerald.gba
ELF_NAME := $(ROM_NAME:.gba=.elf)
MAP_NAME := $(ROM_NAME:.gba=.map)