From 6fe8ada37a52b1684b330c01a78c5c56215d27dd Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 14 Apr 2020 10:20:27 -0700 Subject: [PATCH] ncm/build dist: minor fixes --- Makefile | 1 + stratosphere/ncm/source/ncm_main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 92ac681bf..b9bff6200 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,7 @@ dist-no-debug: all mkdir atmosphere-$(AMSVER)/switch mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000008 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000000D + mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/010000000000002B mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000032 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000034 mkdir -p atmosphere-$(AMSVER)/atmosphere/contents/0100000000000036 diff --git a/stratosphere/ncm/source/ncm_main.cpp b/stratosphere/ncm/source/ncm_main.cpp index e9cc07427..1c2a63d66 100644 --- a/stratosphere/ncm/source/ncm_main.cpp +++ b/stratosphere/ncm/source/ncm_main.cpp @@ -56,18 +56,18 @@ namespace { void *Allocate(size_t size) { void *mem = lmem::AllocateFromExpHeap(g_heap_handle, size); - GetHeapState().Allocate(size); + ncm::GetHeapState().Allocate(size); return mem; } void Deallocate(void *p, size_t size) { - GetHeapState().Free(size); + ncm::GetHeapState().Free(size != 0 ? size : lmem::GetExpHeapMemoryBlockSize(p)); lmem::FreeToExpHeap(g_heap_handle, p); } void InitializeHeap() { g_heap_handle = lmem::CreateExpHeap(g_heap_memory, sizeof(g_heap_memory), lmem::CreateOption_None); - GetHeapState().Initialize(g_heap_handle); + ncm::GetHeapState().Initialize(g_heap_handle); } }