From 5096bde219a6d34de276ac7631317036e1511738 Mon Sep 17 00:00:00 2001
From: darkstar <michael@drueing.de>
Date: Sun, 23 Jun 2019 01:21:48 +0200
Subject: [PATCH 1/2] MSVC: clean up libraries and link against XInput

---
 src/win/msvc/vc16/global.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/win/msvc/vc16/global.props b/src/win/msvc/vc16/global.props
index 747d653..bf790cd 100644
--- a/src/win/msvc/vc16/global.props
+++ b/src/win/msvc/vc16/global.props
@@ -9,6 +9,9 @@
     <ClCompile>
       <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_STDIO_ISO_WIDE_SPECIFIERS;USE_DYNAREC;USE_OPENAL;USE_SDL;USE_FLUIDSYNTH;USE_MUNT;USE_D2D=2;USE_D3DX;USE_WONDER;USE_XL24;USE_GUSMAX;USE_PAS16;USE_WD1002;USE_ST11;USE_MICRAL;USE_COMPAQ;USE_SIS496;USE_SIS471</PreprocessorDefinitions>
     </ClCompile>
+    <Link>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;uuid.lib;xinput.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file

From b389e0befc8f6450aa2442c041fc6443f405610b Mon Sep 17 00:00:00 2001
From: darkstar <michael@drueing.de>
Date: Sun, 23 Jun 2019 01:22:28 +0200
Subject: [PATCH 2/2] MSVC: Update project files

---
 src/win/msvc/vc16/VARCem.vcxproj         |  5 ++---
 src/win/msvc/vc16/VARCem.vcxproj.filters | 15 ++++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/win/msvc/vc16/VARCem.vcxproj b/src/win/msvc/vc16/VARCem.vcxproj
index f3ca94e..4f61db7 100644
--- a/src/win/msvc/vc16/VARCem.vcxproj
+++ b/src/win/msvc/vc16/VARCem.vcxproj
@@ -30,6 +30,7 @@
     <ClCompile Include="..\..\..\devices\chipsets\sis471.c" />
     <ClCompile Include="..\..\..\devices\chipsets\sis496.c" />
     <ClCompile Include="..\..\..\devices\chipsets\wd76c10.c" />
+    <ClCompile Include="..\..\..\devices\floppy\fdc_pii15xb.c" />
     <ClCompile Include="..\..\..\devices\floppy\fdd_mfm.c" />
     <ClCompile Include="..\..\..\devices\misc\bugger.c" />
     <ClCompile Include="..\..\..\devices\cdrom\cdrom.c" />
@@ -161,7 +162,6 @@
     <ClCompile Include="..\..\..\devices\sound\sound_dev.c" />
     <ClCompile Include="..\..\..\devices\system\clk.c" />
     <ClCompile Include="..\..\..\devices\system\dma.c" />
-    <ClCompile Include="..\..\..\devices\system\intel.c" />
     <ClCompile Include="..\..\..\devices\system\intel_flash.c" />
     <ClCompile Include="..\..\..\devices\system\intel_piix.c" />
     <ClCompile Include="..\..\..\devices\system\intel_sio.c" />
@@ -320,7 +320,6 @@
     <ClCompile Include="..\..\..\win\win.c" />
     <ClCompile Include="..\..\..\win\win_about.c" />
     <ClCompile Include="..\..\..\win\win_cdrom.c" />
-    <ClCompile Include="..\..\..\win\win_crashdump.c" />
     <ClCompile Include="..\..\..\win\win_d3d.cpp" />
     <ClCompile Include="..\..\..\win\win_ddraw.cpp" />
     <ClCompile Include="..\..\..\win\win_devconf.c" />
@@ -351,6 +350,7 @@
     <ClInclude Include="..\..\..\devices\chipsets\sis471.h" />
     <ClInclude Include="..\..\..\devices\chipsets\sis496.h" />
     <ClInclude Include="..\..\..\devices\chipsets\wd76c10.h" />
+    <ClInclude Include="..\..\..\devices\floppy\fdc_pii15xb.h" />
     <ClInclude Include="..\..\..\devices\floppy\fdd_mfm.h" />
     <ClInclude Include="..\..\..\devices\misc\bugger.h" />
     <ClInclude Include="..\..\..\devices\cdrom\cdrom.h" />
@@ -505,7 +505,6 @@
     <ClInclude Include="..\..\..\devices\sound\sound.h" />
     <ClInclude Include="..\..\..\devices\system\clk.h" />
     <ClInclude Include="..\..\..\devices\system\dma.h" />
-    <ClInclude Include="..\..\..\devices\system\intel.h" />
     <ClInclude Include="..\..\..\devices\system\intel_flash.h" />
     <ClInclude Include="..\..\..\devices\system\intel_piix.h" />
     <ClInclude Include="..\..\..\devices\system\intel_sio.h" />
diff --git a/src/win/msvc/vc16/VARCem.vcxproj.filters b/src/win/msvc/vc16/VARCem.vcxproj.filters
index 0b15d9e..2495d3a 100644
--- a/src/win/msvc/vc16/VARCem.vcxproj.filters
+++ b/src/win/msvc/vc16/VARCem.vcxproj.filters
@@ -70,9 +70,6 @@
     <ClCompile Include="..\..\..\win\win_cdrom.c">
       <Filter>win</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\win\win_crashdump.c">
-      <Filter>win</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\win\win_d3d.cpp">
       <Filter>win</Filter>
     </ClCompile>
@@ -518,9 +515,6 @@
     <ClCompile Include="..\..\..\devices\system\dma.c">
       <Filter>devices\system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\devices\system\intel.c">
-      <Filter>devices\system</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\devices\system\intel_flash.c">
       <Filter>devices\system</Filter>
     </ClCompile>
@@ -937,6 +931,9 @@
     <ClCompile Include="..\..\..\devices\system\port92.c">
       <Filter>devices\system</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\devices\floppy\fdc_pii15xb.c">
+      <Filter>devices\floppy</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\config.h" />
@@ -1472,9 +1469,6 @@
     <ClInclude Include="..\..\..\devices\system\dma.h">
       <Filter>devices\system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\devices\system\intel.h">
-      <Filter>devices\system</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\devices\system\intel_flash.h">
       <Filter>devices\system</Filter>
     </ClInclude>
@@ -1707,6 +1701,9 @@
     <ClInclude Include="..\..\..\devices\system\port92.h">
       <Filter>devices\system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\devices\floppy\fdc_pii15xb.h">
+      <Filter>devices\floppy</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cpu">