From 91b787a5bebe20ecaa04dab5c953144b7a2a2647 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 11 Dec 2021 14:06:26 -0600
Subject: [PATCH] Update SDL and switch to arch-specific headers on Windows

SDL -> e2ade2b
---
 app/app.pro                               |  6 ++++--
 libs                                      |  2 +-
 moonlight-common-c/moonlight-common-c.pro | 10 ++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/app.pro b/app/app.pro
index 3e3710aa..1156b90f 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -33,18 +33,20 @@ DEFINES += QT_DEPRECATED_WARNINGS
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 win32 {
-    INCLUDEPATH += $$PWD/../libs/windows/include
-
     contains(QT_ARCH, i386) {
         LIBS += -L$$PWD/../libs/windows/lib/x86
+        INCLUDEPATH += $$PWD/../libs/windows/include/x86
     }
     contains(QT_ARCH, x86_64) {
         LIBS += -L$$PWD/../libs/windows/lib/x64
+        INCLUDEPATH += $$PWD/../libs/windows/include/x64
     }
     contains(QT_ARCH, arm64) {
         LIBS += -L$$PWD/../libs/windows/lib/arm64
+        INCLUDEPATH += $$PWD/../libs/windows/include/arm64
     }
 
+    INCLUDEPATH += $$PWD/../libs/windows/include
     LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
 }
 macx {
diff --git a/libs b/libs
index ecd79f7b..b6d497c9 160000
--- a/libs
+++ b/libs
@@ -1 +1 @@
-Subproject commit ecd79f7bbdbf718ccd6bd348d2d0616d7a604551
+Subproject commit b6d497c9c2e0bb7da98519ea45e5c75bc19b6451
diff --git a/moonlight-common-c/moonlight-common-c.pro b/moonlight-common-c/moonlight-common-c.pro
index 246dd1a1..3e4c69cf 100644
--- a/moonlight-common-c/moonlight-common-c.pro
+++ b/moonlight-common-c/moonlight-common-c.pro
@@ -19,6 +19,16 @@ CONFIG += warn_off
 include(../globaldefs.pri)
 
 win32 {
+    contains(QT_ARCH, i386) {
+        INCLUDEPATH += $$PWD/../libs/windows/include/x86
+    }
+    contains(QT_ARCH, x86_64) {
+        INCLUDEPATH += $$PWD/../libs/windows/include/x64
+    }
+    contains(QT_ARCH, arm64) {
+        INCLUDEPATH += $$PWD/../libs/windows/include/arm64
+    }
+
     INCLUDEPATH += $$PWD/../libs/windows/include
 }
 macx {