(CTR/3DS) improved .cia building

Makerom supports template .rsf files directly.
This commit is contained in:
jakcron 2015-09-16 11:25:17 +08:00
parent 71280f9ae5
commit ec5a50da80
3 changed files with 10 additions and 13 deletions

View File

@ -15,6 +15,8 @@ APP_UNIQUE_ID = 0xBAC00
APP_ICON = ctr/default.png APP_ICON = ctr/default.png
APP_BANNER = ctr/libretro_banner.png APP_BANNER = ctr/libretro_banner.png
APP_AUDIO = ctr/silent.wav APP_AUDIO = ctr/silent.wav
APP_CIA_RSF = ctr/tools/template-cia.rsf
APP_3DS_RSF = ctr/tools/template-3ds.rsf
include ctr/Makefile.cores include ctr/Makefile.cores
@ -369,15 +371,12 @@ $(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
$(TARGET).icn: $(APP_ICON) $(TARGET).icn: $(APP_ICON)
$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@ $(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
$(TARGET).rsf: ctr/tools/template-cia.rsf
cat ctr/tools/template-cia.rsf | sed 's/{APP_TITLE}/$(APP_TITLE)/' | sed 's/{APP_PRODUCT_CODE}/$(APP_PRODUCT_CODE)/' | sed 's/{APP_UNIQUE_ID}/$(APP_UNIQUE_ID)/' > $@
$(TARGET)_stripped.elf: $(TARGET).elf $(TARGET)_stripped.elf: $(TARGET).elf
cp $(TARGET).elf $@ cp $(TARGET).elf $@
$(STRIP) $@ $(STRIP) $@
$(TARGET).cia: $(TARGET)_stripped.elf $(TARGET).bnr $(TARGET).icn $(TARGET).rsf $(TARGET).cia: $(TARGET)_stripped.elf $(TARGET).bnr $(TARGET).icn
$(MAKEROM) -f cia -o $@ -rsf $(TARGET).rsf -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(TARGET).icn -banner $(TARGET).bnr $(MAKEROM) -f cia -o $@ -rsf $(APP_CIA_RSF) -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE=$(APP_TITLE) -DAPP_PRODUCT_CODE=$(APP_PRODUCT_CODE) -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID)
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)
@ -387,7 +386,6 @@ clean:
rm -f $(TARGET).cia rm -f $(TARGET).cia
rm -f $(TARGET).bnr rm -f $(TARGET).bnr
rm -f $(TARGET).icn rm -f $(TARGET).icn
rm -f $(TARGET).rsf
rm -f *_shader_shbin.h rm -f *_shader_shbin.h
.PHONY: clean .PHONY: clean

View File

@ -1,7 +1,7 @@
BasicInfo: BasicInfo:
Title : "{APP_TITLE}" Title : "$(APP_TITLE)"
CompanyCode : "00" CompanyCode : "00"
ProductCode : "{APP_PRODUCT_CODE}" ProductCode : "$(APP_PRODUCT_CODE)"
ContentType : Application ContentType : Application
Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
@ -9,9 +9,8 @@ BasicInfo:
# Specifies the root path of the file system to include in the ROM. # Specifies the root path of the file system to include in the ROM.
# HostRoot : "romfs" # HostRoot : "romfs"
TitleInfo: TitleInfo:
UniqueId : {APP_UNIQUE_ID} UniqueId : $(APP_UNIQUE_ID)
Category : Application Category : Application
CardInfo: CardInfo:

View File

@ -1,7 +1,7 @@
BasicInfo: BasicInfo:
Title : "{APP_TITLE}" Title : "$(APP_TITLE)"
CompanyCode : "00" CompanyCode : "00"
ProductCode : "{APP_PRODUCT_CODE}" ProductCode : "$(APP_PRODUCT_CODE)"
ContentType : Application ContentType : Application
Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
@ -10,7 +10,7 @@ BasicInfo:
# HostRoot : "romfs" # HostRoot : "romfs"
TitleInfo: TitleInfo:
UniqueId : {APP_UNIQUE_ID} UniqueId : $(APP_UNIQUE_ID)
Category : Application Category : Application
CardInfo: CardInfo: