diff --git a/Makefile b/Makefile index a5f50fa..ceaee42 100644 --- a/Makefile +++ b/Makefile @@ -155,8 +155,13 @@ $(OUTPUT).cia : $(OUTPUT).elf @echo $(notdir $(OUTPUT)) @cp $(OUTPUT).elf $(TARGET)_stripped.elf arm-none-eabi-strip $(TARGET)_stripped.elf +ifeq ($(shell uname),Linux) + makerom -f cci -rsf $(TOPDIR)/resources/gw_workaround.rsf -target d -exefslogo -elf $(TARGET)_stripped.elf -icon $(TOPDIR)/resources/icon.bin -banner $(TOPDIR)/resources/banner.bin -o $(TOPDIR)/$(notdir $(OUTPUT)).3ds + makerom -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)/resources/build_cia.rsf -icon $(TOPDIR)/resources/icon.bin -banner $(TOPDIR)/resources/banner.bin -exefslogo -target t +else $(TOPDIR)\resources\makerom.exe -f cci -rsf $(TOPDIR)\resources\gw_workaround.rsf -target d -exefslogo -elf $(TARGET)_stripped.elf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -o $(TOPDIR)\$(notdir $(OUTPUT)).3ds $(TOPDIR)\resources\makerom.exe -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)\resources\build_cia.rsf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -exefslogo -target t +endif # @echo built ... $(notdir $@) #--------------------------------------------------------------------------------- diff --git a/banner.png b/banner.png new file mode 100644 index 0000000..aaa5081 Binary files /dev/null and b/banner.png differ diff --git a/resources/banner.bin b/resources/banner.bin index d2d3fff..3cbb0f3 100644 Binary files a/resources/banner.bin and b/resources/banner.bin differ diff --git a/resources/build_cia.rsf b/resources/build_cia.rsf index 2bbf84e..af92f9f 100644 --- a/resources/build_cia.rsf +++ b/resources/build_cia.rsf @@ -5,10 +5,6 @@ BasicInfo: ContentType : Application # Application / SystemUpdate / Manual / Child / Trial Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem -Rom: - # Specifies the root path of the file system to include in the ROM. - # HostRoot : "$(ROMFS_ROOT)" - TitleInfo: UniqueId : 0xf0032 # This was/is the first real homebrew app. I hope this TID range is not used by any retail game/app. @@ -26,21 +22,6 @@ Option: FreeProductCode : true # Removes limitations on ProductCode EnableCrypt : false # Enables encryption for NCCH and CIA MediaFootPadding : false # If true CCI files are created with padding - -ExeFs: # these are the program segments from the ELF, check your elf for the appropriate segment names - ReadOnly: - - .rodata - - RO - ReadWrite: - - .data - - RO - Text: - - .init - - .text - - STUP_ENTRY - -PlainRegion: # only used with SDK ELFs - # - .module_id AccessControlInfo: # UseOtherVariationSaveData : true @@ -195,6 +176,7 @@ AccessControlInfo: - ssl:C - y2r:u - ldr:ro + - ir:rst - ir:USER - ir:u - csnd:SND @@ -237,4 +219,4 @@ SystemControlInfo: ro: 0x0004013000003702L socket: 0x0004013000002e02L spi: 0x0004013000002302L - ssl: 0x0004013000002f02L \ No newline at end of file + ssl: 0x0004013000002f02L diff --git a/resources/gw_workaround.rsf b/resources/gw_workaround.rsf index 3c6bcec..00ddcff 100644 --- a/resources/gw_workaround.rsf +++ b/resources/gw_workaround.rsf @@ -5,10 +5,6 @@ BasicInfo: ContentType : Application # Application / SystemUpdate / Manual / Child / Trial Logo : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem -Rom: - # Specifies the root path of the file system to include in the ROM. - #HostRoot : "romfs" - TitleInfo: UniqueId : 0xf0021 # This was/is the first real homebrew app. I hope this TID range is not used by any retail game/app. @@ -25,21 +21,6 @@ Option: MediaFootPadding : false # If true CCI files are created with padding EnableCrypt : true # Enables encryption for NCCH and CIA EnableCompress : true # Compresses exefs code - -ExeFs: # these are the program segments from the ELF, check your elf for the appropriate segment names - ReadOnly: - - .rodata - - RO - ReadWrite: - - .data - - RO - Text: - - .init - - .text - - STUP_ENTRY - -PlainRegion: # only used with SDK ELFs - - .module_id AccessControlInfo: #UseExtSaveData : true @@ -231,4 +212,4 @@ CommonHeaderKey: AAAAAAAAAABOn/rw/7//8ec/APIA8JH/APaR/1D/gf9Y/4H/cP+B/3j/gf8B AQD/AAIA/iECAPz///////////////////////////////////////////// ////////////////////////////////////////AAAAAAAAAAAAAAAAAAAA - AAADAAAAAAAAAAAAAAAAAAI= \ No newline at end of file + AAADAAAAAAAAAAAAAAAAAAI= diff --git a/resources/icon.bin b/resources/icon.bin index 0ba034b..fb487c8 100644 Binary files a/resources/icon.bin and b/resources/icon.bin differ diff --git a/resources/makerom.exe b/resources/makerom.exe index ee5f10b..3c7ee62 100644 Binary files a/resources/makerom.exe and b/resources/makerom.exe differ