Don't define CPP until MODERN is defined.

This commit is contained in:
luckytyphlosion 2020-12-16 21:16:55 -05:00
parent 166183d5ed
commit 32e566def0

View File

@ -18,12 +18,6 @@ PREFIX := arm-none-eabi-
OBJCOPY := $(PREFIX)objcopy OBJCOPY := $(PREFIX)objcopy
AS := $(PREFIX)as AS := $(PREFIX)as
ifneq ($(MODERN),1)
CPP := $(CC) -E
else
CPP := $(PREFIX)cpp
endif
LD := $(PREFIX)ld LD := $(PREFIX)ld
# note: the makefile must be set up so MODERNCC is never called # note: the makefile must be set up so MODERNCC is never called
@ -42,6 +36,12 @@ MAKER_CODE := 01
REVISION := 0 REVISION := 0
MODERN ?= 0 MODERN ?= 0
ifneq ($(MODERN),1)
CPP := $(CC) -E
else
CPP := $(PREFIX)cpp
endif
ROM_NAME := pokeemerald.gba ROM_NAME := pokeemerald.gba
ELF_NAME := $(ROM_NAME:.gba=.elf) ELF_NAME := $(ROM_NAME:.gba=.elf)
MAP_NAME := $(ROM_NAME:.gba=.map) MAP_NAME := $(ROM_NAME:.gba=.map)