mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-06-08 17:41:56 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Update permuter/decompme import (#2415)

Browse source 
* [iQue] Update permuter/decompme import

* Fix GCC build
This commit is contained in:
cadmic 2025-01-10 15:05:10 -08:00 • committed by GitHub
parent 5773b12241
commit 1549f34e8e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -225,7 +225,6 @@ endif
VERSION_MACRO := $(shell echo $(VERSION) | tr a-z-. A-Z__) VERSION_MACRO := $(shell echo $(VERSION) | tr a-z-. A-Z__)
CPP_DEFINES += -DOOT_VERSION=$(VERSION_MACRO) -DOOT_REVISION=$(REVISION) CPP_DEFINES += -DOOT_VERSION=$(VERSION_MACRO) -DOOT_REVISION=$(REVISION)
CPP_DEFINES += -DOOT_REGION=REGION_$(REGION) CPP_DEFINES += -DOOT_REGION=REGION_$(REGION)
CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
CPP_DEFINES += -DLIBULTRA_VERSION=LIBULTRA_VERSION_$(LIBULTRA_VERSION) CPP_DEFINES += -DLIBULTRA_VERSION=LIBULTRA_VERSION_$(LIBULTRA_VERSION)
CPP_DEFINES += -DLIBULTRA_PATCH=$(LIBULTRA_PATCH) CPP_DEFINES += -DLIBULTRA_PATCH=$(LIBULTRA_PATCH)
ifeq ($(PLATFORM),IQUE) ifeq ($(PLATFORM),IQUE)
@ -534,6 +533,8 @@ $(shell mkdir -p $(foreach dir, \
$(dir:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%))) $(dir:$(EXTRACTED_DIR)/%=$(BUILD_DIR)/%)))
endif endif
$(BUILD_DIR)/src/boot/build.o: CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
ifeq ($(COMPILER),ido) ifeq ($(COMPILER),ido)
$(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2 $(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2

2
tools/permuter_settings.toml
View file

@ -33,4 +33,4 @@ ACTOR_DEBUG_PRINTF = "void"
[decompme.compilers] [decompme.compilers]
"tools/ido_recomp/*/7.1/cc" = "ido7.1" "tools/ido_recomp/*/7.1/cc" = "ido7.1"
"tools/ido_recomp/*/5.3/cc" = "ido5.3" "tools/ido_recomp/*/5.3/cc" = "ido5.3"
"tools/egcs/*/gcc" = "egcs_1.1.2-4" "tools/egcs/*/gcc" = "egcs_1.1.2-4c"