reorganize repo, move shit around

Hydr8gon · Mar 16, 2017 · 8a4ed8f · 8a4ed8f
1 parent 10ca9b6
commit 8a4ed8f
Show file tree

Hide file tree

Showing 38 changed files with 717 additions and 43 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -32,7 +32,6 @@ ROM filename is currently hardcoded, check NDS.cpp for the required filename. th
 TODO LIST
 
  * sorta-UI (ie not hardcode ROM name)
- * 3D engine
  * sound
  * wifi
  * other non-core shit (debugger, graphics viewers, cheat crapo, etc)
@@ -41,7 +40,6 @@ TODO LIST
 IMMEDIATE TODO LIST (prior release 1.0)
 
  * UI
- * some polish to the 3D engine
  * make timers suck less
 
 

diff --git a/melonDS.cbp b/melonDS.cbp
@@ -4,35 +4,33 @@
 	<Project>
 		<Option title="melonDS" />
 		<Option pch_mode="2" />
-		<Option compiler="mingw64_gcc" />
+		<Option compiler="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="mingw64_gcc" />
+				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-m64" />
 					<Add option="-g" />
 				</Compiler>
 				<Linker>
 					<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="mingw64_gcc" />
+				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-m64" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add option="-m64" />
-					<Add library="gdi32" />
 				</Linker>
 			</Target>
 		</Build>
@@ -43,42 +41,46 @@
 		</Compiler>
 		<Linker>
 			<Add option="-m64" />
+			<Add library="gdi32" />
+			<Add library="wx_baseu-3.0" />
+			<Add library="wx_mswu_core-3.0" />
+			<Add library="SDL2" />
 		</Linker>
-		<Unit filename="ARM.cpp" />
-		<Unit filename="ARM.h" />
-		<Unit filename="ARMInterpreter.cpp" />
-		<Unit filename="ARMInterpreter.h" />
-		<Unit filename="ARMInterpreter_ALU.cpp" />
-		<Unit filename="ARMInterpreter_ALU.h" />
-		<Unit filename="ARMInterpreter_Branch.cpp" />
-		<Unit filename="ARMInterpreter_Branch.h" />
-		<Unit filename="ARMInterpreter_LoadStore.cpp" />
-		<Unit filename="ARMInterpreter_LoadStore.h" />
-		<Unit filename="ARM_InstrTable.h" />
-		<Unit filename="CP15.cpp" />
-		<Unit filename="CP15.h" />
-		<Unit filename="DMA.cpp" />
-		<Unit filename="DMA.h" />
-		<Unit filename="FIFO.h" />
-		<Unit filename="GPU.cpp" />
-		<Unit filename="GPU.h" />
-		<Unit filename="GPU2D.cpp" />
-		<Unit filename="GPU2D.h" />
-		<Unit filename="GPU3D.cpp" />
-		<Unit filename="GPU3D.h" />
-		<Unit filename="GPU3D_Soft.cpp" />
-		<Unit filename="NDS.cpp" />
-		<Unit filename="NDS.h" />
-		<Unit filename="NDSCart.cpp" />
-		<Unit filename="NDSCart.h" />
-		<Unit filename="RTC.cpp" />
-		<Unit filename="RTC.h" />
-		<Unit filename="SPI.cpp" />
-		<Unit filename="SPI.h" />
-		<Unit filename="Wifi.cpp" />
-		<Unit filename="Wifi.h" />
-		<Unit filename="main.cpp" />
-		<Unit filename="types.h" />
+		<Unit filename="src/ARM.cpp" />
+		<Unit filename="src/ARM.h" />
+		<Unit filename="src/ARMInterpreter.cpp" />
+		<Unit filename="src/ARMInterpreter.h" />
+		<Unit filename="src/ARMInterpreter_ALU.cpp" />
+		<Unit filename="src/ARMInterpreter_ALU.h" />
+		<Unit filename="src/ARMInterpreter_Branch.cpp" />
+		<Unit filename="src/ARMInterpreter_Branch.h" />
+		<Unit filename="src/ARMInterpreter_LoadStore.cpp" />
+		<Unit filename="src/ARMInterpreter_LoadStore.h" />
+		<Unit filename="src/ARM_InstrTable.h" />
+		<Unit filename="src/CP15.cpp" />
+		<Unit filename="src/CP15.h" />
+		<Unit filename="src/DMA.cpp" />
+		<Unit filename="src/DMA.h" />
+		<Unit filename="src/FIFO.h" />
+		<Unit filename="src/GPU.cpp" />
+		<Unit filename="src/GPU.h" />
+		<Unit filename="src/GPU2D.cpp" />
+		<Unit filename="src/GPU2D.h" />
+		<Unit filename="src/GPU3D.cpp" />
+		<Unit filename="src/GPU3D.h" />
+		<Unit filename="src/GPU3D_Soft.cpp" />
+		<Unit filename="src/NDS.cpp" />
+		<Unit filename="src/NDS.h" />
+		<Unit filename="src/NDSCart.cpp" />
+		<Unit filename="src/NDSCart.h" />
+		<Unit filename="src/RTC.cpp" />
+		<Unit filename="src/RTC.h" />
+		<Unit filename="src/SPI.cpp" />
+		<Unit filename="src/SPI.h" />
+		<Unit filename="src/Wifi.cpp" />
+		<Unit filename="src/Wifi.h" />
+		<Unit filename="src/main.cpp" />
+		<Unit filename="src/types.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />

diff --git a/ARM.cpp → src/ARM.cpp b/ARM.cpp → src/ARM.cpp
diff --git a/ARM.h → src/ARM.h b/ARM.h → src/ARM.h
diff --git a/ARMInterpreter.cpp → src/ARMInterpreter.cpp b/ARMInterpreter.cpp → src/ARMInterpreter.cpp
diff --git a/ARMInterpreter.h → src/ARMInterpreter.h b/ARMInterpreter.h → src/ARMInterpreter.h
diff --git a/ARMInterpreter_ALU.cpp → src/ARMInterpreter_ALU.cpp b/ARMInterpreter_ALU.cpp → src/ARMInterpreter_ALU.cpp
diff --git a/ARMInterpreter_ALU.h → src/ARMInterpreter_ALU.h b/ARMInterpreter_ALU.h → src/ARMInterpreter_ALU.h
diff --git a/ARMInterpreter_Branch.cpp → src/ARMInterpreter_Branch.cpp b/ARMInterpreter_Branch.cpp → src/ARMInterpreter_Branch.cpp
diff --git a/ARMInterpreter_Branch.h → src/ARMInterpreter_Branch.h b/ARMInterpreter_Branch.h → src/ARMInterpreter_Branch.h
diff --git a/ARMInterpreter_LoadStore.cpp → src/ARMInterpreter_LoadStore.cpp b/ARMInterpreter_LoadStore.cpp → src/ARMInterpreter_LoadStore.cpp
diff --git a/ARMInterpreter_LoadStore.h → src/ARMInterpreter_LoadStore.h b/ARMInterpreter_LoadStore.h → src/ARMInterpreter_LoadStore.h
diff --git a/ARM_InstrTable.h → src/ARM_InstrTable.h b/ARM_InstrTable.h → src/ARM_InstrTable.h
diff --git a/CP15.cpp → src/CP15.cpp b/CP15.cpp → src/CP15.cpp
diff --git a/CP15.h → src/CP15.h b/CP15.h → src/CP15.h
diff --git a/DMA.cpp → src/DMA.cpp b/DMA.cpp → src/DMA.cpp
diff --git a/DMA.h → src/DMA.h b/DMA.h → src/DMA.h
diff --git a/FIFO.h → src/FIFO.h b/FIFO.h → src/FIFO.h
diff --git a/GPU.cpp → src/GPU.cpp b/GPU.cpp → src/GPU.cpp
diff --git a/GPU.h → src/GPU.h b/GPU.h → src/GPU.h
diff --git a/GPU2D.cpp → src/GPU2D.cpp b/GPU2D.cpp → src/GPU2D.cpp
diff --git a/GPU2D.h → src/GPU2D.h b/GPU2D.h → src/GPU2D.h
diff --git a/GPU3D.cpp → src/GPU3D.cpp b/GPU3D.cpp → src/GPU3D.cpp
diff --git a/GPU3D.h → src/GPU3D.h b/GPU3D.h → src/GPU3D.h
diff --git a/GPU3D_Soft.cpp → src/GPU3D_Soft.cpp b/GPU3D_Soft.cpp → src/GPU3D_Soft.cpp
diff --git a/NDS.cpp → src/NDS.cpp b/NDS.cpp → src/NDS.cpp
@@ -312,7 +312,7 @@ void Reset()
     //LoadROM();
     //LoadFirmware();
     // a_interp2.nds a_rounding (10) (11)    a_slope (5)
-    if (NDSCart::LoadROM("rom/sm64ds.nds"))
+    if (NDSCart::LoadROM("rom/nsmb.nds"))
         Running = true; // hax
 }
 

diff --git a/NDS.h → src/NDS.h b/NDS.h → src/NDS.h
diff --git a/NDSCart.cpp → src/NDSCart.cpp b/NDSCart.cpp → src/NDSCart.cpp
diff --git a/NDSCart.h → src/NDSCart.h b/NDSCart.h → src/NDSCart.h
diff --git a/RTC.cpp → src/RTC.cpp b/RTC.cpp → src/RTC.cpp
diff --git a/RTC.h → src/RTC.h b/RTC.h → src/RTC.h
diff --git a/SPI.cpp → src/SPI.cpp b/SPI.cpp → src/SPI.cpp
diff --git a/SPI.h → src/SPI.h b/SPI.h → src/SPI.h
diff --git a/Wifi.cpp → src/Wifi.cpp b/Wifi.cpp → src/Wifi.cpp
diff --git a/Wifi.h → src/Wifi.h b/Wifi.h → src/Wifi.h
diff --git a/main.cpp → src/main.cpp b/main.cpp → src/main.cpp
diff --git a/types.h → src/types.h b/types.h → src/types.h