From 5c8e745645d4d17810e51dd6bdcb473d6c16183c Mon Sep 17 00:00:00 2001 From: Revo Date: Sun, 20 Dec 2020 13:10:13 -0500 Subject: [PATCH] Pass NON_MATCHING to spec when defined. (#549) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1370db57bb..dcd89360b4 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,14 @@ ORIG_COMPILER ?= 0 ifeq ($(NON_MATCHING),1) CFLAGS := -DNON_MATCHING + CPPFLAGS := -DNON_MATCHING COMPARE := 0 endif PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) MAKE = make -CPPFLAGS = -P +CPPFLAGS += -P ifeq ($(OS),Windows_NT) $(error Native Windows builds not yet supported. Please use WSL, Docker or a Linux VM) @@ -129,7 +130,6 @@ O_FILES := $(foreach f,$(S_FILES:.s=.o),build/$f) \ # create build directories $(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(TEXTURE_DIRS) $(TEXTURE_BIN_DIRS) $(SCENE_DIRS),build/$(dir))) - build/src/libultra_boot_O1/%.o: OPTFLAGS := -O1 build/src/libultra_boot_O2/%.o: OPTFLAGS := -O2 build/src/libultra_code_O1/%.o: OPTFLAGS := -O1