From 613d4721798d7db68ac2d84f2cdae520c47b64e6 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 13 Aug 2023 22:15:52 -0400 Subject: [PATCH] Wrote NitroFS file list to file --- Makefile | 10 ++++++++-- config.mk | 1 - pmdsky.us/rom_header_template.sbin | Bin 16384 -> 16384 bytes 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 195badfc..030ab210 100644 --- a/Makefile +++ b/Makefile @@ -55,12 +55,18 @@ $(NEF): libsyscall libsyscall: $(MAKE) -C lib/syscall all install INSTALL_PREFIX=$(abspath $(WORK_DIR)/$(BUILD_DIR)) GAME_CODE=$(GAME_CODE) +NITROFS_FILES_FILE := $(BUILD_DIR)/nitrofs_files.txt + +# There are too many data files, exceeding Windows's command length limit. Write the file list to a file to get around this limit. +nitrofs_files_file: + echo "NITROFS_FILES=" $(NITROFS_FILES:files/%=%) > $(NITROFS_FILES_FILE) + $(BUILD_DIR)/component.files: main ; $(HEADER_TEMPLATE): ; -$(ROM): $(ROMSPEC) tools filesystem main sub $(BANNER) - $(WINE) $(MAKEROM) $(MAKEROM_FLAGS) -DBUILD_DIR=$(BUILD_DIR) -DNITROFS_FILES="" -DTITLE_NAME="$(TITLE_NAME)" -DBNR="$(BANNER)" -DHEADER_TEMPLATE="$(HEADER_TEMPLATE)" $< $@ +$(ROM): $(ROMSPEC) tools filesystem main sub $(BANNER) nitrofs_files_file + $(WINE) $(MAKEROM) $(MAKEROM_FLAGS) -DBUILD_DIR=$(BUILD_DIR) -M$(NITROFS_FILES_FILE) -DTITLE_NAME="$(TITLE_NAME)" -DBNR="$(BANNER)" -DHEADER_TEMPLATE="$(HEADER_TEMPLATE)" $< $@ $(FIXROM) $@ --secure-crc $(SECURE_CRC) --game-code $(GAME_CODE) ifeq ($(COMPARE),1) $(SHA1SUM) -c $(buildname)/rom.sha1 diff --git a/config.mk b/config.mk index 7f930e0d..90c97481 100644 --- a/config.mk +++ b/config.mk @@ -36,7 +36,6 @@ ifndef SECURE_CRC $(error Unsupported ROM: $(GAME_LANGUAGE)) endif -# At present this repository only supports the 1.0 US ROM SUPPORTED_ROMS := pmdsky.us ifneq ($(filter $(buildname),$(SUPPORTED_ROMS)),$(buildname)) $(error $(buildname) is not supported, choose from: $(SUPPORTED_ROMS)) diff --git a/pmdsky.us/rom_header_template.sbin b/pmdsky.us/rom_header_template.sbin index 787f1392bad6028c0b7629deb7eb1003104d0baa..fe586ef786ac258c0baf4bada9309c19bac0b0ac 100644 GIT binary patch delta 33 pcmZo@U~Fh$oY26yd1B*TCcPt*4>HDY-p}aBw^>l&z5c`nf&k_b4O9RC delta 35 rcmZo@U~Fh$oY25{U}EE4rvDQrA7qT*yr0pLkLAGYeAdm30)O-Y5iSng