diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2025-02-04 11:55:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-04 06:55:04 -0500 |
| commit | c028db03b47f8b38bc2a1b87569fd7fae0ea9067 (patch) | |
| tree | 99007ef3e69f69b4e6924ba54468adda49461565 /Makefile | |
| parent | 6c06168e7212616ea08460d487a4b99e89a34108 (diff) | |
Finish matching ique-cn (#2451)
* git subrepo clone git@github.com:Thar0/com-plugin.git tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "e8543312d"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "e8543312d"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* ique-cn OK
* Review suggestions
* Most suggestions
* git subrepo pull tools/com-plugin
subrepo:
subdir: "tools/com-plugin"
merged: "81595ed1c"
upstream:
origin: "git@github.com:Thar0/com-plugin.git"
branch: "main"
commit: "81595ed1c"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* Fix other versions
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 19 insertions, 3 deletions
@@ -36,6 +36,7 @@ COMPILER ?= ido # gc-eu GameCube Europe/PAL # gc-eu-mq GameCube Europe/PAL Master Quest # gc-jp-ce GameCube Japan (Collector's Edition disc) +# ique-cn iQue Player (Simplified Chinese) VERSION ?= gc-eu-mq-dbg # Number of threads to extract and compress with. N_THREADS ?= $(shell nproc) @@ -167,7 +168,6 @@ else ifeq ($(VERSION),gc-jp-ce) BUILD_TIME := 21:53:00 REVISION := 15 else ifeq ($(VERSION),ique-cn) - COMPARE := 0 REGION ?= US PLATFORM := IQUE DEBUG_FEATURES ?= 0 @@ -603,6 +603,7 @@ $(BUILD_DIR)/src/libc/%.o: CFLAGS := $(EGCS_CFLAGS) -mno-abicalls $(BUILD_DIR)/src/libc/%.o: CCASFLAGS := $(EGCS_CCASFLAGS) $(BUILD_DIR)/src/libc/%.o: OPTFLAGS := -O1 $(BUILD_DIR)/src/libc/%.o: MIPS_VERSION := +$(BUILD_DIR)/src/libc/memmove.o: MIPS_VERSION := -mips2 else ifeq ($(DEBUG_FEATURES),1) $(BUILD_DIR)/src/libc/%.o: OPTFLAGS := -g $(BUILD_DIR)/src/libc/%.o: ASOPTFLAGS := -g @@ -825,10 +826,18 @@ $(ROMC): $(ROM) $(ELF) $(BUILD_DIR)/compress_ranges.txt $(PYTHON) tools/compress.py --in $(ROM) --out $@ --dmadata-start `./tools/dmadata_start.sh $(NM) $(ELF)` --compress `cat $(BUILD_DIR)/compress_ranges.txt` --threads $(N_THREADS) $(COMPRESS_ARGS) $(PYTHON) -m ipl3checksum sum --cic $(CIC) --update $@ +COM_PLUGIN := tools/com-plugin/common-plugin.so + +LDFLAGS := -T $(LDSCRIPT) -T $(BUILD_DIR)/linker_scripts/makerom.ld -T $(BUILD_DIR)/undefined_syms.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map $(MAP) +ifeq ($(PLATFORM),IQUE) + LDFLAGS += -plugin $(COM_PLUGIN) -plugin-opt order=$(BASEROM_DIR)/bss-order.txt + $(ELF): $(BASEROM_DIR)/bss-order.txt +endif + $(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(LDSCRIPT) $(BUILD_DIR)/linker_scripts/makerom.ld $(BUILD_DIR)/undefined_syms.txt \ $(SAMPLEBANK_O_FILES) $(SOUNDFONT_O_FILES) $(SEQUENCE_O_FILES) \ $(BUILD_DIR)/assets/audio/sequence_font_table.o $(BUILD_DIR)/assets/audio/audiobank_padding.o - $(LD) -T $(LDSCRIPT) -T $(BUILD_DIR)/linker_scripts/makerom.ld -T $(BUILD_DIR)/undefined_syms.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map $(MAP) -o $@ + $(LD) $(LDFLAGS) -o $@ $(BUILD_DIR)/linker_scripts/makerom.ld: linker_scripts/makerom.ld $(CPP) -I include $(CPPFLAGS) $< > $@ @@ -927,7 +936,7 @@ endif # Incremental link to move z_message and z_game_over data into rodata $(BUILD_DIR)/src/code/z_message_z_game_over.o: $(BUILD_DIR)/src/code/z_message.o $(BUILD_DIR)/src/code/z_game_over.o - $(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $^ + $(LD) -r -G 0 -T linker_scripts/data_with_rodata.ld -o $@ $^ $(BUILD_DIR)/dmadata_table_spec.h $(BUILD_DIR)/compress_ranges.txt: $(BUILD_DIR)/spec $(MKDMADATA) $< $(BUILD_DIR)/dmadata_table_spec.h $(BUILD_DIR)/compress_ranges.txt @@ -964,8 +973,15 @@ endif $(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $(@:.o=.tmp) @$(OBJDUMP) $(OBJDUMP_FLAGS) $@ > $(@:.o=.s) +ifeq ($(PLATFORM),IQUE) +ifneq ($(NON_MATCHING),1) +$(BUILD_DIR)/src/overlays/misc/ovl_kaleido_scope/ovl_kaleido_scope_reloc.o: POSTPROCESS_OBJ := $(PYTHON) tools/patch_ique_kaleido_reloc.py +endif +endif + $(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/spec $(FADO) $$(tools/reloc_prereq $< $(notdir $*)) -n $(notdir $*) -o $(@:.o=.s) -M $(@:.o=.d) + $(POSTPROCESS_OBJ) $(@:.o=.s) $(AS) $(ASFLAGS) $(@:.o=.s) -o $@ $(BUILD_DIR)/assets/%.inc.c: assets/%.png |