From 18a0f9ff9c329e78a66ac04fd6962ef7d252a518 Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 27 Oct 2023 20:00:35 +0200 Subject: [PATCH] Pass assets listing to `buildrom` --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 573ecaf2..6d082782 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ BASE_DIR := $(ROOT)/ph_$(REGION_NAME) LCF_FILE := $(BUILD_DIR)/arm9_linker_script.lcf OBJS_FILE := $(BUILD_DIR)/arm9_objects.txt ARM7_BIOS := $(ROOT)/arm7_bios.bin +ASSETS_TXT := $(ROOT)/assets.txt ASM_FILES := $(wildcard asm/*.s) CXX_FILES := $(wildcard src/*.cpp) @@ -51,9 +52,9 @@ tools: .PHONY: rom rom: arm9 ifneq (,$(wildcard $(ARM7_BIOS))) - $(TOOLS_DIR)/rom/buildrom -a $(BASE_DIR) -b $(TARGET_DIR) -r $(REGION_SUFFIX) -o $(NDS_FILE) -7 $(ARM7_BIOS) + $(TOOLS_DIR)/rom/buildrom -a $(BASE_DIR) -b $(TARGET_DIR) -r $(REGION_SUFFIX) -o $(NDS_FILE) -s $(ASSETS_TXT) -7 $(ARM7_BIOS) else - $(TOOLS_DIR)/rom/buildrom -a $(BASE_DIR) -b $(TARGET_DIR) -r $(REGION_SUFFIX) -o $(NDS_FILE) + $(TOOLS_DIR)/rom/buildrom -a $(BASE_DIR) -b $(TARGET_DIR) -r $(REGION_SUFFIX) -o $(NDS_FILE) -s $(ASSETS_TXT) endif .PHONY: extract