From 10ca9b6f7f20f88dfcdfdf680daf1b04cb7f22c5 Mon Sep 17 00:00:00 2001
From: StapleButter <thetotalworm@gmail.com>
Date: Thu, 16 Mar 2017 19:47:31 +0100
Subject: [PATCH] 64-bit build. make library paths not absolute.

---
 GPU3D.cpp   |  2 +-
 NDS.cpp     |  4 ++--
 melonDS.cbp | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/GPU3D.cpp b/GPU3D.cpp
index 364683e7..8758ce8c 100644
--- a/GPU3D.cpp
+++ b/GPU3D.cpp
@@ -1825,7 +1825,7 @@ void Write32(u32 addr, u32 val)
         {
             GXStat &= ~0x8000;
             ProjMatrixStackPointer = 0;
-            PosMatrixStackPointer = 0;
+            //PosMatrixStackPointer = 0;
             TexMatrixStackPointer = 0;
         }
         val &= 0xC0000000;
diff --git a/NDS.cpp b/NDS.cpp
index aa23d538..06e85f68 100644
--- a/NDS.cpp
+++ b/NDS.cpp
@@ -311,8 +311,8 @@ void Reset()
     // test
     //LoadROM();
     //LoadFirmware();
-    // a_interp2.nds a_rounding (10) (11)
-    if (NDSCart::LoadROM("rom/nsmb.nds"))
+    // a_interp2.nds a_rounding (10) (11)    a_slope (5)
+    if (NDSCart::LoadROM("rom/sm64ds.nds"))
         Running = true; // hax
 }
 
diff --git a/melonDS.cbp b/melonDS.cbp
index 90764d90..4b994389 100644
--- a/melonDS.cbp
+++ b/melonDS.cbp
@@ -4,38 +4,46 @@
 	<Project>
 		<Option title="melonDS" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw64_gcc" />
 		<Build>
 			<Target title="Debug">
 				<Option output="bin/Debug/melonDS" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw64_gcc" />
 				<Compiler>
+					<Add option="-m64" />
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
-					<Add library="C:/MinGW/lib/libgdi32.a" />
+					<Add option="-m64" />
+					<Add library="gdi32" />
 				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="bin/Release/melonDS" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw64_gcc" />
 				<Compiler>
 					<Add option="-O2" />
+					<Add option="-m64" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="C:/MinGW/lib/libgdi32.a" />
+					<Add option="-m64" />
+					<Add library="gdi32" />
 				</Linker>
 			</Target>
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
+			<Add option="-m64" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Linker>
+			<Add option="-m64" />
+		</Linker>
 		<Unit filename="ARM.cpp" />
 		<Unit filename="ARM.h" />
 		<Unit filename="ARMInterpreter.cpp" />