aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/3ds/3ds.mk
diff options
context:
space:
mode:
authorMrHuu2019-11-01 21:17:54 +0100
committerBastien Bouclet2019-11-01 21:17:54 +0100
commit3cef5fa46e091febfd04e94fe592389d86b599ab (patch)
treed2ef42a5196df4cf28b6df60b1dc168c1cfe81ab /backends/platform/3ds/3ds.mk
parentf7c7ca7ac9c228cfcc78f51183e1ce9170b636ed (diff)
downloadscummvm-rg350-3cef5fa46e091febfd04e94fe592389d86b599ab.tar.gz
scummvm-rg350-3cef5fa46e091febfd04e94fe592389d86b599ab.tar.bz2
scummvm-rg350-3cef5fa46e091febfd04e94fe592389d86b599ab.zip
3DS: Remove 3dstool dependency
This patch alters the way the .cia is build. It removes the need for 3dstool. Instead of first generating a .romfs file using 3dstool, let makerom generate the romfs while building the .cia.
Diffstat (limited to 'backends/platform/3ds/3ds.mk')
-rw-r--r--backends/platform/3ds/3ds.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/backends/platform/3ds/3ds.mk b/backends/platform/3ds/3ds.mk
index 99303f5f4d..511408f0a0 100644
--- a/backends/platform/3ds/3ds.mk
+++ b/backends/platform/3ds/3ds.mk
@@ -24,7 +24,6 @@ clean_3ds:
$(RM) $(TARGET).smdh
$(RM) $(TARGET).3dsx
$(RM) $(TARGET).bnr
- $(RM) $(TARGET).romfs
$(RM) $(TARGET).cia
$(RM) -rf romfs
@@ -54,12 +53,8 @@ $(TARGET).bnr: $(APP_BANNER_IMAGE) $(APP_BANNER_AUDIO)
@bannertool makebanner -o $@ -i $(APP_BANNER_IMAGE) -a $(APP_BANNER_AUDIO)
@echo built ... $(notdir $@)
-$(TARGET).romfs: romfs
- @3dstool -cvtf romfs $(TARGET).romfs --romfs-dir romfs
- @echo built ... $(notdir $@)
-
-$(TARGET).cia: $(EXECUTABLE) $(APP_RSF) $(TARGET).smdh $(TARGET).bnr $(TARGET).romfs
- @makerom -f cia -target t -exefslogo -o $@ -elf $(EXECUTABLE) -rsf $(APP_RSF) -banner $(TARGET).bnr -icon $(TARGET).smdh -romfs $(TARGET).romfs
+$(TARGET).cia: $(EXECUTABLE) $(APP_RSF) $(TARGET).smdh $(TARGET).bnr romfs
+ @makerom -f cia -target t -exefslogo -o $@ -elf $(EXECUTABLE) -rsf $(APP_RSF) -banner $(TARGET).bnr -icon $(TARGET).smdh -DAPP_ROMFS=romfs/
@echo built ... $(notdir $@)
#---------------------------------------------------------------------------------