From c84f40cf5770d5e8c7e44ea2c29164070662bd38 Mon Sep 17 00:00:00 2001 From: thedax Date: Fri, 1 Sep 2017 19:33:24 -0400 Subject: [PATCH] 3dstool isn't really needed for romfs generation. (#19) --- Makefile | 13 ++++--------- meta/app.rsf | 3 +++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c1e602c..1e53a7f 100644 --- a/Makefile +++ b/Makefile @@ -167,9 +167,9 @@ MAKEROM ?= makerom MAKEROM_ARGS := -elf "$(OUTPUT).elf" -rsf "$(RSF_PATH)" -banner "$(BUILD)/banner.bnr" -icon "$(BUILD)/icon.icn" -DAPP_TITLE="$(APP_TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" -ifneq ($(strip $(ROMFS)),) - MAKEROM_ARGS += -romfs "$(BUILD)/romfs.bin" -endif +#ifneq ($(strip $(ROMFS)),) +# MAKEROM_ARGS += -romfs "$(BUILD)/romfs.bin" +#endif ifneq ($(strip $(LOGO)),) MAKEROM_ARGS += -logo "$(LOGO)" endif @@ -178,7 +178,7 @@ ifeq ($(strip $(ROMFS)),) $(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/banner.bnr $(BUILD)/icon.icn $(MAKEROM) -f cia -o "$@" -target t -exefslogo $(MAKEROM_ARGS) else -$(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/romfs.bin $(BUILD)/banner.bnr $(BUILD)/icon.icn +$(OUTPUT).cia: $(OUTPUT).elf $(BUILD)/banner.bnr $(BUILD)/icon.icn $(MAKEROM) -f cia -o "$@" -target t -exefslogo $(MAKEROM_ARGS) endif @@ -204,11 +204,6 @@ $(BUILD)/icon.icn : $(APP_ICON) $(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)" -p "$(APP_AUTHOR)" -i "$(APP_ICON)" -f "$(ICON_FLAGS)" -o "$@" -3DSTOOL ?= 3dstool - -$(BUILD)/romfs.bin : $(ROMFS) - $(3DSTOOL) -ctf romfs "$@" --romfs-dir "$(ROMFS)" - #--------------------------------------------------------------------------------- else diff --git a/meta/app.rsf b/meta/app.rsf index 78f25c4..17a50eb 100644 --- a/meta/app.rsf +++ b/meta/app.rsf @@ -33,6 +33,9 @@ SystemControlInfo: RemasterVersion: 7 StackSize: 0x40000 +RomFs: + RootPath : romfs + # DO NOT EDIT BELOW HERE OR PROGRAMS WILL NOT LAUNCH (most likely) AccessControlInfo: