Merge remote-tracking branch 'remotes/origin/master' into melonDSi

src/CMakeLists.txt

@@ -4,6 +4,7 @@ add_library(core STATIC
 	ARCodeList.cpp
 	AREngine.cpp
 	ARM.cpp
+	ARM_InstrTable.h
 	ARMInterpreter.cpp
 	ARMInterpreter_ALU.cpp
 	ARMInterpreter_Branch.cpp
@@ -20,19 +21,27 @@ add_library(core STATIC
 	DSi_NWifi.cpp
 	DSi_SD.cpp
 	DSi_SPI_TSC.cpp
+	FIFO.h
 	GBACart.cpp
 	GPU.cpp
+	GPU_OpenGL.cpp
+	GPU_OpenGL_shaders.h
 	GPU2D.cpp
 	GPU3D.cpp
 	GPU3D_OpenGL.cpp
+	GPU3D_OpenGL_shaders.h
 	GPU3D_Soft.cpp
 	NDS.cpp
 	NDSCart.cpp
 	OpenGLSupport.cpp
+	Platform.h
+	ROMList.h
 	RTC.cpp
 	Savestate.cpp
 	SPI.cpp
 	SPU.cpp
+	types.h
+	version.h
 	Wifi.cpp
 	WifiAP.cpp