add cia build support

elhobbs · May 20, 2017 · e8f0b8f · e8f0b8f
1 parent 194b7ef
commit e8f0b8f
Show file tree

Hide file tree

Showing 15 changed files with 973 additions and 2 deletions.
diff --git a/3ds/main.c b/3ds/main.c
@@ -33,6 +33,11 @@ void _3ds_shutdown() {
 #endif
 }
 
+void set_default_dir() {
+	static const char current_dir_dummy[] = { "sdmc:/3ds/hexen/" };
+	chdir(current_dir_dummy);
+}
+
 int main(int argc, char**argv)
 {
 #ifdef _3DS
@@ -44,6 +49,11 @@ int main(int argc, char**argv)
 #endif
 
 	printf("gfx init complete\n");
+
+	//hack for cia base directory
+	if (argc == 0) {
+		set_default_dir();
+	}
 
 	atexit(_3ds_shutdown);
 
@@ -266,8 +276,10 @@ void I_Quit(void)
 
 byte *I_ZoneBase(int *size)
 {
-	int heap = 24*1024*1024;
-	byte *ptr = hmalloc(heap);;
+	int heap = envGetHeapSize() - 8*1024*1024;
+	printf("heap size: %d\n", heap);
+	svcSleepThread(3000000000LL);
+	byte *ptr = hmalloc(heap);
 
 	*size = heap;
 	return ptr;

diff --git a/Makefile b/Makefile
@@ -36,6 +36,14 @@ DATA		:=	data
 INCLUDES	:=	include
 #ROMFS		:=	romfs
 
+APP_TITLE	:=	hexen
+APP_DESCRIPTION	:= hexen for the 3ds
+APP_AUTHOR	:= elhobbs
+
+
+
+export	OUTPUT_FORMAT	?= 3dsx
+
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
@@ -142,12 +150,21 @@ clean:
 	@echo clean ...
 	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
 
+ cia:
+		@make $(MAKEFLAGS) OUTPUT_FORMAT=cia
+
+ 3dsx:
+		@make $(MAKEFLAGS) OUTPUT_FORMAT=3dsx
 
 #---------------------------------------------------------------------------------
 else
 
 DEPENDS	:=	$(OFILES:.o=.d)
 
+.PHONY: all
+
+all:	$(OUTPUT).$(OUTPUT_FORMAT)
+
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
@@ -159,6 +176,19 @@ endif
 
 $(OUTPUT).elf	:	$(OFILES)
 
+$(OUTPUT).cia	:	$(OUTPUT).elf
+	@echo built ... $< $@ 
+	@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/template.rsf -icon $(TOPDIR)/resources/icon.bin -banner $(TOPDIR)/resources/banner.bin -exefslogo -target t
+else
+	$(TOPDIR)\resources\makerom32.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\makerom32.exe -f cia -o $(OUTPUT).cia -elf $(TARGET)_stripped.elf -rsf $(TOPDIR)\resources\template.rsf -icon $(TOPDIR)\resources\icon.bin -banner $(TOPDIR)\resources\banner.bin -exefslogo -target t
+endif
+
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #---------------------------------------------------------------------------------

diff --git a/THNDR1.wav b/THNDR1.wav
diff --git a/banner.png b/banner.png
diff --git a/hexen.3ds b/hexen.3ds
diff --git a/hexen.cia b/hexen.cia
diff --git a/resources/banner.bin b/resources/banner.bin
diff --git a/resources/bannertool32.exe b/resources/bannertool32.exe
diff --git a/resources/build_cia.rsf b/resources/build_cia.rsf
@@ -0,0 +1,222 @@
+BasicInfo:
+  Title                   : "hexen"
+  CompanyCode             : "00"
+  ProductCode             : "HEXEN"
+  ContentType             : Application # Application / SystemUpdate / Manual / Child / Trial
+  Logo                    : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
+
+
+TitleInfo:
+  UniqueId                : 0xf0033 # This was/is the first real homebrew app. I hope this TID range is not used by any retail game/app.
+  Category                : Application # Application / SystemApplication / Applet / Firmware / Base / DlpChild / Demo / Contents / SystemContents / SharedContents / AddOnContents / Patch / AutoUpdateContents
+
+CardInfo:
+  MediaSize               : 512MB # 128MB / 256MB / 512MB / 1GB / 2GB / 4GB / 8GB / 16GB / 32GB
+  MediaType               : Card1 # Card1 / Card2
+  CardDevice              : NorFlash # NorFlash(Pick this if you use savedata) / None
+
+
+Option:
+  UseOnSD                 : true # true if App is to be installed to SD
+  EnableCompress          : true # Compresses exefs code
+  FreeProductCode         : true # Removes limitations on ProductCode
+  EnableCrypt             : false # Enables encryption for NCCH and CIA
+  MediaFootPadding        : false # If true CCI files are created with padding
+
+AccessControlInfo:
+  # UseOtherVariationSaveData : true
+  # UseExtSaveData : true
+  # ExtSaveDataId: 0xffffffff
+  # SystemSaveDataId1: 0x220
+  # SystemSaveDataId2: 0x00040010
+  # OtherUserSaveDataId1: 0x220
+  # OtherUserSaveDataId2: 0x330
+  # OtherUserSaveDataId3: 0x440
+  # UseExtendedSaveDataAccessControl: true
+  # AccessibleSaveDataIds: [0x101, 0x202, 0x303, 0x404, 0x505, 0x606]
+  FileSystemAccess:
+   # - CategorySystemApplication
+   # - CategoryHardwareCheck
+   # - CategoryFileSystemTool
+   - Debug
+   # - TwlCardBackup
+   # - TwlNandData
+   # - Boss
+   - DirectSdmc
+   # - Core
+   # - CtrNandRo
+   # - CtrNandRw
+   # - CtrNandRoWrite
+   # - CategorySystemSettings
+   # - CardBoard
+   # - ExportImportIvs
+   # - DirectSdmcWrite
+   # - SwitchCleanup
+   # - SaveDataMove
+   # - Shop
+   # - Shell
+   # - CategoryHomeMenu
+  IoAccessControl:
+   # - FsMountNand
+   # - FsMountNandRoWrite
+   # - FsMountTwln
+   # - FsMountWnand
+   # - FsMountCardSpi
+   # - UseSdif3
+   # - CreateSeed
+   # - UseCardSpi
+
+  IdealProcessor                : 0
+  AffinityMask                  : 1
+
+  Priority                      : 16
+
+  MaxCpu                        : 0x9E # Default
+
+  DisableDebug                  : true
+  EnableForceDebug              : false
+  CanWriteSharedPage            : true
+  CanUsePrivilegedPriority      : false
+  CanUseNonAlphabetAndNumber    : true
+  PermitMainFunctionArgument    : true
+  CanShareDeviceMemory          : true
+  RunnableOnSleep               : false
+  SpecialMemoryArrange          : true
+
+  CoreVersion                   : 2
+  DescVersion                   : 2
+
+  ReleaseKernelMajor            : "02"
+  ReleaseKernelMinor            : "33" 
+  MemoryType                    : Application # Application / System / Base
+  HandleTableSize: 512
+  IORegisterMapping: 
+   - 1ff50000-1ff57fff
+   - 1ff70000-1ff77fff
+  MemoryMapping: 
+   - 1f000000-1f5fffff:r
+  SystemCallAccess: 
+    ArbitrateAddress: 34
+    Break: 60
+    CancelTimer: 28
+    ClearEvent: 25
+    ClearTimer: 29
+    CloseHandle: 35
+    ConnectToPort: 45
+    ControlMemory: 1
+    CreateAddressArbiter: 33
+    CreateEvent: 23
+    CreateMemoryBlock: 30
+    CreateMutex: 19
+    CreateSemaphore: 21
+    CreateThread: 8
+    CreateTimer: 26
+    DuplicateHandle: 39
+    ExitProcess: 3
+    ExitThread: 9
+    GetCurrentProcessorNumber: 17
+    GetHandleInfo: 41
+    GetProcessId: 53
+    GetProcessIdOfThread: 54
+    GetProcessIdealProcessor: 6
+    GetProcessInfo: 43
+    GetResourceLimit: 56
+    GetResourceLimitCurrentValues: 58
+    GetResourceLimitLimitValues: 57
+    GetSystemInfo: 42
+    GetSystemTick: 40
+    GetThreadContext: 59
+    GetThreadId: 55
+    GetThreadIdealProcessor: 15
+    GetThreadInfo: 44
+    GetThreadPriority: 11
+    MapMemoryBlock: 31
+    OutputDebugString: 61
+    QueryMemory: 2
+    ReleaseMutex: 20
+    ReleaseSemaphore: 22
+    SendSyncRequest1: 46
+    SendSyncRequest2: 47
+    SendSyncRequest3: 48
+    SendSyncRequest4: 49
+    SendSyncRequest: 50
+    SetThreadPriority: 12
+    SetTimer: 27
+    SignalEvent: 24
+    SleepThread: 10
+    UnmapMemoryBlock: 32
+    WaitSynchronization1: 36
+    WaitSynchronizationN: 37
+  InterruptNumbers:
+  ServiceAccessControl: 
+   - APT:U
+   - $hioFIO
+   - $hostio0
+   - $hostio1
+   - ac:u
+   - boss:U
+   - cam:u
+   - cecd:u
+   - cfg:u
+   - dlp:FKCL
+   - dlp:SRVR
+   - dsp::DSP
+   - frd:u
+   - fs:USER
+   - gsp::Gpu
+   - hid:USER
+   - http:C
+   - mic:u
+   - ndm:u
+   - news:u
+   - nwm::UDS
+   - ptm:u
+   - pxi:dev
+   - soc:U
+   - ssl:C
+   - y2r:u
+   - ldr:ro
+   - ir:rst
+   - ir:USER
+   - ir:u
+   - csnd:SND
+   - am:net
+   - ns:s
+
+
+SystemControlInfo:
+  SaveDataSize: 0KB # It doesn't use any save data.
+  RemasterVersion: 2
+  StackSize: 0x40000
+  # JumpId: 0
+  Dependency: 
+    ac: 0x0004013000002402L
+    am: 0x0004013000001502L
+    boss: 0x0004013000003402L
+    camera: 0x0004013000001602L
+    cecd: 0x0004013000002602L
+    cfg: 0x0004013000001702L
+    codec: 0x0004013000001802L
+    csnd: 0x0004013000002702L
+    dlp: 0x0004013000002802L
+    dsp: 0x0004013000001a02L
+    friends: 0x0004013000003202L
+    gpio: 0x0004013000001b02L
+    gsp: 0x0004013000001c02L
+    hid: 0x0004013000001d02L
+    http: 0x0004013000002902L
+    i2c: 0x0004013000001e02L
+    ir: 0x0004013000003302L
+    mcu: 0x0004013000001f02L
+    mic: 0x0004013000002002L
+    ndm: 0x0004013000002b02L
+    news: 0x0004013000003502L
+    nim: 0x0004013000002c02L
+    nwm: 0x0004013000002d02L
+    pdn: 0x0004013000002102L
+    ps: 0x0004013000003102L
+    ptm: 0x0004013000002202L
+    ro: 0x0004013000003702L
+    socket: 0x0004013000002e02L
+    spi: 0x0004013000002302L
+    ssl: 0x0004013000002f02L