Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	UI/GameSettingsScreen.cpp

Windows/MainWindow.cpp

@@ -48,13 +48,19 @@
 #include "Core/MIPS/JitCommon/JitBlockCache.h"
 #include "Windows/InputBox.h"
 #include "Windows/InputDevice.h"
+#if !defined(_M_ARM64) && !defined(_M_ARM)
 #include "Windows/GPU/WindowsGLContext.h"
+#include "Windows/GEDebugger/GEDebugger.h"
+#endif
 #include "Windows/Debugger/Debugger_Disasm.h"
 #include "Windows/Debugger/Debugger_MemoryDlg.h"
-#include "Windows/GEDebugger/GEDebugger.h"
+
+#include "Common/GraphicsContext.h"
 
 #include "Windows/main.h"
+#ifndef _M_ARM
 #include "Windows/DinputDevice.h"
+#endif
 #include "Windows/EmuThread.h"
 #include "Windows/resource.h"
 
@@ -519,9 +525,10 @@ namespace MainWindow
 		DialogManager::AddDlg(disasmWindow[0]);
 		disasmWindow[0]->Show(g_Config.bShowDebuggerOnLoad);
 
+#if !defined(_M_ARM64) && !defined(_M_ARM)
 		geDebuggerWindow = new CGEDebugger(MainWindow::GetHInstance(), MainWindow::GetHWND());
 		DialogManager::AddDlg(geDebuggerWindow);
-
+#endif
 		memoryWindow[0] = new CMemoryDlg(MainWindow::GetHInstance(), MainWindow::GetHWND(), currentDebugMIPS);
 		DialogManager::AddDlg(memoryWindow[0]);
 	}
@@ -532,11 +539,13 @@ namespace MainWindow
 			delete disasmWindow[0];
 		disasmWindow[0] = 0;
 		
+#if !defined(_M_ARM64) && !defined(_M_ARM)
 		DialogManager::RemoveDlg(geDebuggerWindow);
 		if (geDebuggerWindow)
 			delete geDebuggerWindow;
 		geDebuggerWindow = 0;
-		
+#endif
+
 		DialogManager::RemoveDlg(memoryWindow[0]);
 		if (memoryWindow[0])
 			delete memoryWindow[0];
@@ -822,7 +831,9 @@ namespace MainWindow
 			return WindowsRawInput::ProcessChar(hWnd, wParam, lParam);
 
 		case WM_DEVICECHANGE:
+#ifndef _M_ARM
 			DinputDevice::CheckDevices();
+#endif
 			return DefWindowProc(hWnd, message, wParam, lParam);
 
 		case WM_VERYSLEEPY_MSG: