mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 13:30:47 +00:00
Code Issues Projects Releases Wiki Activity

Pass NON_MATCHING to spec when defined. (#549)

Browse source
This commit is contained in:
Revo 2020-12-20 13:10:13 -05:00 committed by GitHub
parent 2d35a25212
commit 5c8e745645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -11,13 +11,14 @@ ORIG_COMPILER ?= 0
ifeq ($(NON_MATCHING),1) ifeq ($(NON_MATCHING),1)
CFLAGS := -DNON_MATCHING CFLAGS := -DNON_MATCHING
CPPFLAGS := -DNON_MATCHING
COMPARE := 0 COMPARE := 0
endif endif
PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
MAKE = make MAKE = make
CPPFLAGS = -P CPPFLAGS += -P
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
$(error Native Windows builds not yet supported. Please use WSL, Docker or a Linux VM) $(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 # create build directories
$(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(TEXTURE_DIRS) $(TEXTURE_BIN_DIRS) $(SCENE_DIRS),build/$(dir))) $(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_O1/%.o: OPTFLAGS := -O1
build/src/libultra_boot_O2/%.o: OPTFLAGS := -O2 build/src/libultra_boot_O2/%.o: OPTFLAGS := -O2
build/src/libultra_code_O1/%.o: OPTFLAGS := -O1 build/src/libultra_code_O1/%.o: OPTFLAGS := -O1