Compare commits

..

No commits in common. "master" and "v2.4.2" have entirely different histories.

3 changed files with 7 additions and 8 deletions

View File

@ -43,7 +43,7 @@ SOURCES := source
DATA := data DATA := data
INCLUDES := include INCLUDES := include
#ROMFS := romfs #ROMFS := romfs
APP_VERSION := 2.4.4 APP_VERSION := 2.4.2
ifeq ($(RELEASE),) ifeq ($(RELEASE),)
APP_VERSION := $(APP_VERSION)-$(shell git describe --dirty --always) APP_VERSION := $(APP_VERSION)-$(shell git describe --dirty --always)

View File

@ -245,8 +245,7 @@
{ {
"type": "debug_flags", "type": "debug_flags",
"value": { "value": {
"allow_debug": false, "allow_debug": true,
"force_debug_prod": false,
"force_debug": true "force_debug": true
} }
}, },

View File

@ -44,7 +44,7 @@ bool __nx_fsdev_support_cwd = false;
// Used by trampoline.s // Used by trampoline.s
Result g_lastRet = 0; Result g_lastRet = 0;
void NX_NORETURN nroEntrypointTrampoline(const ConfigEntry* entries, u64 handle, u64 entrypoint); void NORETURN nroEntrypointTrampoline(const ConfigEntry* entries, u64 handle, u64 entrypoint);
void __libnx_initheap(void) void __libnx_initheap(void)
{ {
@ -501,11 +501,11 @@ void loadNro(void)
// LastLoadResult // LastLoadResult
entries[6].Value[0] = g_lastRet; entries[6].Value[0] = g_lastRet;
// RandomSeed // RandomSeed
entries[9].Value[0] = randomGet64(); entries[8].Value[0] = randomGet64();
entries[9].Value[1] = randomGet64(); entries[8].Value[1] = randomGet64();
// HosVersion // HosVersion
entries[11].Value[0] = hosversionGet(); entries[10].Value[0] = hosversionGet();
entries[11].Value[1] = hosversionIsAtmosphere() ? 0x41544d4f53504852UL : 0; // 'ATMOSPHR' entries[10].Value[1] = hosversionIsAtmosphere() ? 0x41544d4f53504852UL : 0; // 'ATMOSPHR'
g_nroAddr = (u64)map_addr; g_nroAddr = (u64)map_addr;
g_nroSize = nro_size; g_nroSize = nro_size;