From 9d4d3cd331313e00c28fa355ec587f1a7e1a014a Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Tue, 11 Feb 2020 21:45:48 -0600
Subject: [PATCH] [nostalgia/core/gba] Move cstartup.cpp to NostalgiaCore-GBA

---
 deps/gbastartup/CMakeLists.txt                    |  1 -
 src/nostalgia/core/gba/CMakeLists.txt             |  1 +
 .../nostalgia/core/gba}/cstartup.cpp              | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 rename {deps/gbastartup => src/nostalgia/core/gba}/cstartup.cpp (68%)

diff --git a/deps/gbastartup/CMakeLists.txt b/deps/gbastartup/CMakeLists.txt
index 203bbb72..1adae538 100644
--- a/deps/gbastartup/CMakeLists.txt
+++ b/deps/gbastartup/CMakeLists.txt
@@ -2,7 +2,6 @@ enable_language(C ASM)
 add_library(
 	GbaStartup
 		gba_crt0.s
-		cstartup.cpp
 )
 
 target_link_libraries(
diff --git a/src/nostalgia/core/gba/CMakeLists.txt b/src/nostalgia/core/gba/CMakeLists.txt
index a1a57942..c112c0cd 100644
--- a/src/nostalgia/core/gba/CMakeLists.txt
+++ b/src/nostalgia/core/gba/CMakeLists.txt
@@ -1,6 +1,7 @@
 if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
 	add_library(
 		NostalgiaCore-GBA
+			cstartup.cpp
 			core.cpp
 			gfx.cpp
 			media.cpp
diff --git a/deps/gbastartup/cstartup.cpp b/src/nostalgia/core/gba/cstartup.cpp
similarity index 68%
rename from deps/gbastartup/cstartup.cpp
rename to src/nostalgia/core/gba/cstartup.cpp
index 22a1710d..80952fc2 100644
--- a/deps/gbastartup/cstartup.cpp
+++ b/src/nostalgia/core/gba/cstartup.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2016 - 2020 gtalent2@gmail.com
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpedantic"
@@ -7,6 +14,13 @@ extern void (*__preinit_array_end[]) (void);
 extern void (*__init_array_start[]) (void);
 extern void (*__init_array_end[]) (void);
 
+namespace nostalgia::core {
+
+void initHeap();
+
+}
+
+
 extern "C" {
 
 void __libc_init_array() {
@@ -24,6 +38,7 @@ int main(int argc, const char **argv);
 
 int c_start() {
 	const char *args[2] = {"", "rom.oxfs"};
+	nostalgia::core::initHeap();
 	return main(2, args);
 }