From fbf808e691643e7f6a457da3ee60622de3d739bd Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 01:11:33 -0700
Subject: [PATCH 01/22] remove ProjectDependencies from sln file

---
 Source/dolphin-emu.sln | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln
index 9c11d2fe96..eae9a775c2 100644
--- a/Source/dolphin-emu.sln
+++ b/Source/dolphin-emu.sln
@@ -3,16 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8EA11166-6512-44FC-B7A5-A4D1ECC81170} = {8EA11166-6512-44FC-B7A5-A4D1ECC81170}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{E54CF649-140E-4255-81A5-30A673C1FB36}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{54AA7840-5BEB-4A0C-9452-74BA4CC7FD44}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8EA11166-6512-44FC-B7A5-A4D1ECC81170} = {8EA11166-6512-44FC-B7A5-A4D1ECC81170}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{2E6C348C-C75C-4D94-8D1E-9C1FCBF3EFE4}"
 EndProject

From b116e05abe22941b41e760591d8e760206b8e027 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 01:12:07 -0700
Subject: [PATCH 02/22] [windows] Do not copy cpack_package_description.txt to
 output dir

---
 Source/Core/DolphinQt2/DolphinQt2.vcxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
index 888b126218..f7d1655254 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
@@ -237,7 +237,7 @@
   <!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
   <ItemGroup>
     <DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
-    <DataTxtFiles Include="$(DolphinRootDir)Data\*.txt" />
+    <DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
     <ExternalDlls Include="$(ExternalsDir)OpenAL\lib\*.dll" />
     <BinaryFiles Include="$(TargetPath)" />
     <AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(ExternalDlls);@(BinaryFiles)" />

From ddae5058e9531185614e4525d99d6bf2eb7ff46c Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 01:33:50 -0700
Subject: [PATCH 03/22] msbuild: increment other version numbers to vs2017
 equivalents

---
 Externals/libusb/msvc/libusb_static_2013.vcxproj | 2 +-
 Source/Core/DolphinWX/DolphinWX.vcxproj.user     | 2 +-
 Source/DSPTool/DSPTool.vcxproj.filters           | 2 +-
 Source/UnitTests/UnitTests.vcxproj.user          | 2 +-
 Source/VSProps/Base.props                        | 2 +-
 Source/VSProps/ClDisableAllWarnings.props        | 2 +-
 Source/VSProps/PCHCommon.props                   | 2 +-
 Source/VSProps/PCHCreate.props                   | 2 +-
 Source/VSProps/PCHUse.props                      | 2 +-
 Source/VSProps/QtCompile.props                   | 2 +-
 Source/VSProps/QtCompile.targets                 | 2 +-
 Source/VSProps/WXWOverrides.props                | 2 +-
 Source/dolphin-emu.sln                           | 4 ++--
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Externals/libusb/msvc/libusb_static_2013.vcxproj b/Externals/libusb/msvc/libusb_static_2013.vcxproj
index 7966a0d14b..74833e810c 100644
--- a/Externals/libusb/msvc/libusb_static_2013.vcxproj
+++ b/Externals/libusb/msvc/libusb_static_2013.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.user b/Source/Core/DolphinWX/DolphinWX.vcxproj.user
index aa15c4df30..85a227e9d2 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj.user
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--For some stupid reason this has to be in the .user file...-->
     <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
diff --git a/Source/DSPTool/DSPTool.vcxproj.filters b/Source/DSPTool/DSPTool.vcxproj.filters
index 0aac9b1684..d42f12f9c6 100644
--- a/Source/DSPTool/DSPTool.vcxproj.filters
+++ b/Source/DSPTool/DSPTool.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="TestData">
       <UniqueIdentifier>{0b70242b-1d98-432f-a60e-d4ca0674852e}</UniqueIdentifier>
diff --git a/Source/UnitTests/UnitTests.vcxproj.user b/Source/UnitTests/UnitTests.vcxproj.user
index e472aa9c6d..d3dc252eee 100644
--- a/Source/UnitTests/UnitTests.vcxproj.user
+++ b/Source/UnitTests/UnitTests.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--For some stupid reason this has to be in the .user file...-->
     <!--This is only used to allow UnitTests to find OpenAL DLL...kinda hacky-->
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index fb2382ed08..7164db2b7c 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <DolphinRelease Condition="'$(DolphinRelease)'!='true' or '$(Configuration)'!='Release'">false</DolphinRelease>
diff --git a/Source/VSProps/ClDisableAllWarnings.props b/Source/VSProps/ClDisableAllWarnings.props
index 6710049dee..38a9931147 100644
--- a/Source/VSProps/ClDisableAllWarnings.props
+++ b/Source/VSProps/ClDisableAllWarnings.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
diff --git a/Source/VSProps/PCHCommon.props b/Source/VSProps/PCHCommon.props
index c2247264b7..dc4c1979e9 100644
--- a/Source/VSProps/PCHCommon.props
+++ b/Source/VSProps/PCHCommon.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
diff --git a/Source/VSProps/PCHCreate.props b/Source/VSProps/PCHCreate.props
index 451a8f71a5..f12198092c 100644
--- a/Source/VSProps/PCHCreate.props
+++ b/Source/VSProps/PCHCreate.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="PCHCommon.props" />
   </ImportGroup>
diff --git a/Source/VSProps/PCHUse.props b/Source/VSProps/PCHUse.props
index b803a9593f..43e0aaf435 100644
--- a/Source/VSProps/PCHUse.props
+++ b/Source/VSProps/PCHUse.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="PCHCommon.props" />
   </ImportGroup>
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
index 896dc0954d..d8aa0f6cb5 100644
--- a/Source/VSProps/QtCompile.props
+++ b/Source/VSProps/QtCompile.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <QTDIRDefault>$(ExternalsDir)Qt\Qt5.8.0\5.8\msvc2015_64\</QTDIRDefault>
     <QTDIR Condition="Exists('$(QTDIRDefault)') And ('$(QTDIR)'=='' Or !Exists('$(QTDIR)'))">$(QTDIRDefault)</QTDIR>
diff --git a/Source/VSProps/QtCompile.targets b/Source/VSProps/QtCompile.targets
index c12753982e..9ab1522a8d 100644
--- a/Source/VSProps/QtCompile.targets
+++ b/Source/VSProps/QtCompile.targets
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CleanDependsOn>QtResourceClean;QtUiClean;QtMocClean;$(CleanDependsOn)</CleanDependsOn>
     <!--
diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props
index 8d8ff31d89..2d13bdbdc7 100644
--- a/Source/VSProps/WXWOverrides.props
+++ b/Source/VSProps/WXWOverrides.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln
index eae9a775c2..558aeac982 100644
--- a/Source/dolphin-emu.sln
+++ b/Source/dolphin-emu.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}"
 EndProject

From a4d23db041951ed1d4da93dd47db26497e597504 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 01:34:31 -0700
Subject: [PATCH 04/22] Include utf8 BOM in sln file so shell displays a nice
 icon

---
 Source/dolphin-emu.sln | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln
index 558aeac982..7b560448ec 100644
--- a/Source/dolphin-emu.sln
+++ b/Source/dolphin-emu.sln
@@ -1,3 +1,4 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.12

From c251311b02e8729bcb393e938d32acbd40f5caf3 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 01:52:51 -0700
Subject: [PATCH 05/22] DolphinQt: remove I_AM_BUILDACUS as the buildbot
 doesn't use it anymore

---
 Source/Core/DolphinQt2/DolphinQt2.vcxproj | 2 +-
 Source/VSProps/QtCompile.props            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
index f7d1655254..895009546f 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
@@ -246,7 +246,7 @@
     <ClInclude Include="Resources.h" />
   </ItemGroup>
   <!--Disable copying to binary dir for now on the buildbot to prevent packaging of the outputs-->
-  <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(I_AM_BUILDACUS)'==''">
+  <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')">
     <Message Text="Copying Data directory..." Importance="High" />
     <Copy SourceFiles="@(DataSysFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataSysFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataSysFiles.Extension)').Ticks)" />
     <Copy SourceFiles="@(DataTxtFiles)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(Filename)%(DataTxtFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataTxtFiles.Extension)').Ticks)" />
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
index d8aa0f6cb5..bfca34c8d1 100644
--- a/Source/VSProps/QtCompile.props
+++ b/Source/VSProps/QtCompile.props
@@ -138,7 +138,6 @@
   </PropertyGroup>
   <Target Name="QtCopyBinaries"
     AfterTargets="Build"
-    Condition="'$(I_AM_BUILDACUS)'==''"
     Inputs="@(QtDlls);@(QtPlugins)"
     Outputs="@(QtDlls -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)');@(QtPlugins -> '$(BinaryOutputDir)$(QtPluginFolder)\%(RecursiveDir)%(Filename)%(Extension)')">
     <Message Text="Copying Qt .dlls" Importance="High" />

From 80642a944d86487af6fd1963731098ab0574dd64 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 02:32:52 -0700
Subject: [PATCH 06/22] wxw[msw]: disable wxUSE_DBGHELP (issue 7591)

---
 Externals/wxWidgets3/wx/wxmsw.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Externals/wxWidgets3/wx/wxmsw.h b/Externals/wxWidgets3/wx/wxmsw.h
index e5df859a5f..185da7781e 100644
--- a/Externals/wxWidgets3/wx/wxmsw.h
+++ b/Externals/wxWidgets3/wx/wxmsw.h
@@ -1663,6 +1663,8 @@
 //
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_CRASHREPORT 0
+
+#define wxUSE_DBGHELP 0
 /* --- end MSW options --- */
 
 #endif // _WX_SETUP_H_

From e8e2f329fbb02eeeb533f5d5ef4e5eb92fa07f97 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 02:33:10 -0700
Subject: [PATCH 07/22] wxw: clean up vcxproj a bit

---
 .../wxWidgets3/build/msw/wx_base.vcxproj      | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
index 5f4f4a2c09..1e2bd889e9 100644
--- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj
+++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
@@ -807,9 +807,13 @@
     </ClCompile>
     <ClCompile Include="..\..\src\common\fs_arc.cpp" />
     <ClCompile Include="..\..\src\common\fs_filter.cpp" />
-    <ClCompile Include="..\..\src\common\fs_inet.cpp" />
+    <ClCompile Include="..\..\src\common\fs_inet.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\fs_mem.cpp" />
-    <ClCompile Include="..\..\src\common\ftp.cpp" />
+    <ClCompile Include="..\..\src\common\ftp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\gaugecmn.cpp" />
     <ClCompile Include="..\..\src\common\gbsizer.cpp" />
     <ClCompile Include="..\..\src\common\gdicmn.cpp" />
@@ -825,7 +829,9 @@
     <ClCompile Include="..\..\src\common\headercolcmn.cpp" />
     <ClCompile Include="..\..\src\common\headerctrlcmn.cpp" />
     <ClCompile Include="..\..\src\common\helpbase.cpp" />
-    <ClCompile Include="..\..\src\common\http.cpp" />
+    <ClCompile Include="..\..\src\common\http.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\hyperlnkcmn.cpp" />
     <ClCompile Include="..\..\src\common\iconbndl.cpp" />
     <ClCompile Include="..\..\src\common\imagall.cpp" />
@@ -907,7 +913,9 @@
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\common\process.cpp" />
-    <ClCompile Include="..\..\src\common\protocol.cpp" />
+    <ClCompile Include="..\..\src\common\protocol.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\quantize.cpp" />
     <ClCompile Include="..\..\src\common\radiobtncmn.cpp" />
     <ClCompile Include="..\..\src\common\radiocmn.cpp" />
@@ -918,10 +926,18 @@
     <ClCompile Include="..\..\src\common\rendcmn.cpp" />
     <ClCompile Include="..\..\src\common\rgncmn.cpp" />
     <ClCompile Include="..\..\src\common\richtooltipcmn.cpp" />
-    <ClCompile Include="..\..\src\common\sckaddr.cpp" />
-    <ClCompile Include="..\..\src\common\sckfile.cpp" />
-    <ClCompile Include="..\..\src\common\sckipc.cpp" />
-    <ClCompile Include="..\..\src\common\sckstrm.cpp" />
+    <ClCompile Include="..\..\src\common\sckaddr.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\common\sckfile.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\common\sckipc.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\src\common\sckstrm.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\scrolbarcmn.cpp" />
     <ClCompile Include="..\..\src\common\selectdispatcher.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
@@ -929,7 +945,9 @@
     <ClCompile Include="..\..\src\common\settcmn.cpp" />
     <ClCompile Include="..\..\src\common\sizer.cpp" />
     <ClCompile Include="..\..\src\common\slidercmn.cpp" />
-    <ClCompile Include="..\..\src\common\socket.cpp" />
+    <ClCompile Include="..\..\src\common\socket.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\socketiohandler.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -975,7 +993,9 @@
     <ClCompile Include="..\..\src\common\uiactioncmn.cpp" />
     <ClCompile Include="..\..\src\common\unichar.cpp" />
     <ClCompile Include="..\..\src\common\uri.cpp" />
-    <ClCompile Include="..\..\src\common\url.cpp" />
+    <ClCompile Include="..\..\src\common\url.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\common\ustring.cpp" />
     <ClCompile Include="..\..\src\common\utilscmn.cpp" />
     <ClCompile Include="..\..\src\common\valgen.cpp" />
@@ -1166,7 +1186,9 @@
     </ClCompile>
     <ClCompile Include="..\..\src\msw\dcscreen.cpp" />
     <ClCompile Include="..\..\src\msw\dde.cpp" />
-    <ClCompile Include="..\..\src\msw\debughlp.cpp" />
+    <ClCompile Include="..\..\src\msw\debughlp.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\dialog.cpp" />
     <ClCompile Include="..\..\src\msw\dialup.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
@@ -1288,7 +1310,9 @@
     <ClCompile Include="..\..\src\msw\settings.cpp" />
     <ClCompile Include="..\..\src\msw\slider.cpp" />
     <ClCompile Include="..\..\src\msw\snglinst.cpp" />
-    <ClCompile Include="..\..\src\msw\sockmsw.cpp" />
+    <ClCompile Include="..\..\src\msw\sockmsw.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\msw\sound.cpp" />
     <ClCompile Include="..\..\src\msw\spinbutt.cpp" />
     <ClCompile Include="..\..\src\msw\spinctrl.cpp" />
@@ -1371,16 +1395,13 @@
     <ClCompile>
       <PreprocessorDefinitions>__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <Lib>
-      <AdditionalOptions>/ignore:4221</AdditionalOptions>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
-      <Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
+      <Project>{4C9F135B-A85E-430C-BAD4-4C67EF5FC12C}</Project>
     </ProjectReference>
     <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
-      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

From 397720a9fe4cc4f89a214c71c31866cece228f1c Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 02:54:31 -0700
Subject: [PATCH 08/22] might as well update yet some more pointless version
 numbers..

---
 Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters | 2 +-
 Externals/cpp-optparse/cpp-optparse.vcxproj.filters      | 2 +-
 Externals/cubeb/msvc/cubeb.vcxproj.filters               | 2 +-
 Externals/curl/curl.vcxproj.filters                      | 2 +-
 Externals/enet/enet.vcxproj.filters                      | 2 +-
 Externals/glslang/glslang.vcxproj.filters                | 2 +-
 Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters   | 2 +-
 Source/Core/AudioCommon/AudioCommon.vcxproj.filters      | 2 +-
 Source/Core/Common/Common.vcxproj.filters                | 2 +-
 Source/Core/Core/Core.vcxproj.filters                    | 2 +-
 Source/Core/DiscIO/DiscIO.vcxproj.filters                | 2 +-
 Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters        | 2 +-
 Source/Core/DolphinQt2/DolphinQt2.vcxproj.user           | 2 +-
 Source/Core/DolphinWX/DolphinWX.vcxproj.filters          | 2 +-
 Source/Core/InputCommon/InputCommon.vcxproj.filters      | 2 +-
 Source/Core/VideoBackends/D3D/D3D.vcxproj.filters        | 2 +-
 Source/Core/VideoBackends/OGL/OGL.vcxproj.filters        | 2 +-
 Source/Core/VideoCommon/VideoCommon.vcxproj.filters      | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters b/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters
index c80b82db38..eeb863f747 100644
--- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters
+++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\..\src\SFML\Network\Http.cpp" />
     <ClCompile Include="..\..\src\SFML\Network\IPAddress.cpp" />
diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj.filters b/Externals/cpp-optparse/cpp-optparse.vcxproj.filters
index f9d83ae283..2848c86a53 100644
--- a/Externals/cpp-optparse/cpp-optparse.vcxproj.filters
+++ b/Externals/cpp-optparse/cpp-optparse.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="OptionParser.cpp" />
   </ItemGroup>
diff --git a/Externals/cubeb/msvc/cubeb.vcxproj.filters b/Externals/cubeb/msvc/cubeb.vcxproj.filters
index 2272900c3e..f92ba0c32b 100644
--- a/Externals/cubeb/msvc/cubeb.vcxproj.filters
+++ b/Externals/cubeb/msvc/cubeb.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClInclude Include="..\include\cubeb\cubeb.h" />
     <ClInclude Include="..\src\cubeb_array_queue.h" />
diff --git a/Externals/curl/curl.vcxproj.filters b/Externals/curl/curl.vcxproj.filters
index bac5c47c7d..ca7915fae2 100644
--- a/Externals/curl/curl.vcxproj.filters
+++ b/Externals/curl/curl.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="lib\amigaos.c" />
     <ClCompile Include="lib\asyn-ares.c" />
diff --git a/Externals/enet/enet.vcxproj.filters b/Externals/enet/enet.vcxproj.filters
index 5ad022de37..bb53359ac3 100644
--- a/Externals/enet/enet.vcxproj.filters
+++ b/Externals/enet/enet.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="include">
       <UniqueIdentifier>{a5756b80-36f2-45f6-b1f1-b67082477376}</UniqueIdentifier>
diff --git a/Externals/glslang/glslang.vcxproj.filters b/Externals/glslang/glslang.vcxproj.filters
index ca65ea2e05..e39f863a5f 100644
--- a/Externals/glslang/glslang.vcxproj.filters
+++ b/Externals/glslang/glslang.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="glslang\GenericCodeGen\Link.cpp">
       <Filter>glslang\GenericCodeGen</Filter>
diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters
index 20b13ccbcc..225e069276 100644
--- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters
+++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Setup Headers">
       <UniqueIdentifier>{ea19c29f-6825-47dc-b54d-ee464810b353}</UniqueIdentifier>
diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters
index 7c3fe389ee..35ba0a6c7d 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj.filters
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SoundStreams">
       <UniqueIdentifier>{25ec8f16-fc60-4a63-bc3e-ad0272fd5942}</UniqueIdentifier>
diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
index 267fde6d83..107355431a 100644
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
       <UniqueIdentifier>{0336df21-7c3f-48a9-b767-9cf11d8958a6}</UniqueIdentifier>
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index 8dee1673d1..5f10c6fbd5 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="ActionReplay">
       <UniqueIdentifier>{e0d231ab-7a66-45ce-a8e4-c0225308f763}</UniqueIdentifier>
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj.filters b/Source/Core/DiscIO/DiscIO.vcxproj.filters
index b56078e599..38f1b7c2d8 100644
--- a/Source/Core/DiscIO/DiscIO.vcxproj.filters
+++ b/Source/Core/DiscIO/DiscIO.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="DiscScrubber">
       <UniqueIdentifier>{3873659a-9a30-4a58-af9e-8dad7d7eb627}</UniqueIdentifier>
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
index 5e25b8b58f..e3d6e53cec 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="MainWindow.cpp" />
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
index 42da7cddad..81453971f2 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
index a230a9db4d..10bb09664f 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="GUI">
       <UniqueIdentifier>{0c0288ac-1168-4534-b3d3-051b9981f842}</UniqueIdentifier>
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index 3b1c4025e0..600a77727d 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="ControllerInterface">
       <UniqueIdentifier>{3a755a86-0efa-4396-bf79-bb3a1910764d}</UniqueIdentifier>
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
index 67e78c6c29..04eb8fb19f 100644
--- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="D3D">
       <UniqueIdentifier>{ae700f7e-33c8-45b5-b7ee-a0ded3630549}</UniqueIdentifier>
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
index 201a4045f8..aac1b1fe9e 100644
--- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Decoder">
       <UniqueIdentifier>{f29f8e7f-21ba-49da-8044-e5279a091c8f}</UniqueIdentifier>
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
index ec0150a272..eb45d40ffc 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Base">
       <UniqueIdentifier>{23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9}</UniqueIdentifier>

From d1d75ff962003a958de0fb24aecebe11b77f4ab7 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 03:22:33 -0700
Subject: [PATCH 09/22] remove unused msbuild file content

---
 Externals/cpp-optparse/cpp-optparse.vcxproj   |   6 -
 .../cpp-optparse/cpp-optparse.vcxproj.filters |   9 -
 Externals/curl/curl.vcxproj.filters           | 272 ------------------
 Externals/glslang/glslang.vcxproj             |   6 -
 4 files changed, 293 deletions(-)
 delete mode 100644 Externals/cpp-optparse/cpp-optparse.vcxproj.filters
 delete mode 100644 Externals/curl/curl.vcxproj.filters

diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj b/Externals/cpp-optparse/cpp-optparse.vcxproj
index 2ab8b046c8..57e5b86cb9 100644
--- a/Externals/cpp-optparse/cpp-optparse.vcxproj
+++ b/Externals/cpp-optparse/cpp-optparse.vcxproj
@@ -35,12 +35,6 @@
     <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="OptionParser.cpp" />
   </ItemGroup>
diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj.filters b/Externals/cpp-optparse/cpp-optparse.vcxproj.filters
deleted file mode 100644
index 2848c86a53..0000000000
--- a/Externals/cpp-optparse/cpp-optparse.vcxproj.filters
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="OptionParser.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="OptionParser.h" />
-  </ItemGroup>
-</Project>
diff --git a/Externals/curl/curl.vcxproj.filters b/Externals/curl/curl.vcxproj.filters
deleted file mode 100644
index ca7915fae2..0000000000
--- a/Externals/curl/curl.vcxproj.filters
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="lib\amigaos.c" />
-    <ClCompile Include="lib\asyn-ares.c" />
-    <ClCompile Include="lib\asyn-thread.c" />
-    <ClCompile Include="lib\base64.c" />
-    <ClCompile Include="lib\conncache.c" />
-    <ClCompile Include="lib\connect.c" />
-    <ClCompile Include="lib\content_encoding.c" />
-    <ClCompile Include="lib\cookie.c" />
-    <ClCompile Include="lib\curl_addrinfo.c" />
-    <ClCompile Include="lib\curl_des.c" />
-    <ClCompile Include="lib\curl_endian.c" />
-    <ClCompile Include="lib\curl_fnmatch.c" />
-    <ClCompile Include="lib\curl_gethostname.c" />
-    <ClCompile Include="lib\curl_gssapi.c" />
-    <ClCompile Include="lib\curl_memrchr.c" />
-    <ClCompile Include="lib\curl_multibyte.c" />
-    <ClCompile Include="lib\curl_ntlm_core.c" />
-    <ClCompile Include="lib\curl_ntlm_wb.c" />
-    <ClCompile Include="lib\curl_rtmp.c" />
-    <ClCompile Include="lib\curl_sasl.c" />
-    <ClCompile Include="lib\curl_sspi.c" />
-    <ClCompile Include="lib\curl_threads.c" />
-    <ClCompile Include="lib\dict.c" />
-    <ClCompile Include="lib\dotdot.c" />
-    <ClCompile Include="lib\easy.c" />
-    <ClCompile Include="lib\escape.c" />
-    <ClCompile Include="lib\file.c" />
-    <ClCompile Include="lib\fileinfo.c" />
-    <ClCompile Include="lib\formdata.c" />
-    <ClCompile Include="lib\ftp.c" />
-    <ClCompile Include="lib\ftplistparser.c" />
-    <ClCompile Include="lib\getenv.c" />
-    <ClCompile Include="lib\getinfo.c" />
-    <ClCompile Include="lib\gopher.c" />
-    <ClCompile Include="lib\hash.c" />
-    <ClCompile Include="lib\hmac.c" />
-    <ClCompile Include="lib\hostasyn.c" />
-    <ClCompile Include="lib\hostcheck.c" />
-    <ClCompile Include="lib\hostip.c" />
-    <ClCompile Include="lib\hostip4.c" />
-    <ClCompile Include="lib\hostip6.c" />
-    <ClCompile Include="lib\hostsyn.c" />
-    <ClCompile Include="lib\http.c" />
-    <ClCompile Include="lib\http_chunks.c" />
-    <ClCompile Include="lib\http_digest.c" />
-    <ClCompile Include="lib\http_negotiate.c" />
-    <ClCompile Include="lib\http_ntlm.c" />
-    <ClCompile Include="lib\http_proxy.c" />
-    <ClCompile Include="lib\http2.c" />
-    <ClCompile Include="lib\idn_win32.c" />
-    <ClCompile Include="lib\if2ip.c" />
-    <ClCompile Include="lib\imap.c" />
-    <ClCompile Include="lib\inet_ntop.c" />
-    <ClCompile Include="lib\inet_pton.c" />
-    <ClCompile Include="lib\krb5.c" />
-    <ClCompile Include="lib\ldap.c" />
-    <ClCompile Include="lib\llist.c" />
-    <ClCompile Include="lib\md4.c" />
-    <ClCompile Include="lib\md5.c" />
-    <ClCompile Include="lib\memdebug.c" />
-    <ClCompile Include="lib\mprintf.c" />
-    <ClCompile Include="lib\multi.c" />
-    <ClCompile Include="lib\netrc.c" />
-    <ClCompile Include="lib\non-ascii.c" />
-    <ClCompile Include="lib\nonblock.c" />
-    <ClCompile Include="lib\nwlib.c" />
-    <ClCompile Include="lib\nwos.c" />
-    <ClCompile Include="lib\openldap.c" />
-    <ClCompile Include="lib\parsedate.c" />
-    <ClCompile Include="lib\pingpong.c" />
-    <ClCompile Include="lib\pipeline.c" />
-    <ClCompile Include="lib\pop3.c" />
-    <ClCompile Include="lib\progress.c" />
-    <ClCompile Include="lib\rawstr.c" />
-    <ClCompile Include="lib\rtsp.c" />
-    <ClCompile Include="lib\security.c" />
-    <ClCompile Include="lib\select.c" />
-    <ClCompile Include="lib\sendf.c" />
-    <ClCompile Include="lib\share.c" />
-    <ClCompile Include="lib\slist.c" />
-    <ClCompile Include="lib\smb.c" />
-    <ClCompile Include="lib\smtp.c" />
-    <ClCompile Include="lib\socks.c" />
-    <ClCompile Include="lib\socks_gssapi.c" />
-    <ClCompile Include="lib\socks_sspi.c" />
-    <ClCompile Include="lib\speedcheck.c" />
-    <ClCompile Include="lib\splay.c" />
-    <ClCompile Include="lib\ssh.c" />
-    <ClCompile Include="lib\strdup.c" />
-    <ClCompile Include="lib\strequal.c" />
-    <ClCompile Include="lib\strerror.c" />
-    <ClCompile Include="lib\strtok.c" />
-    <ClCompile Include="lib\strtoofft.c" />
-    <ClCompile Include="lib\system_win32.c" />
-    <ClCompile Include="lib\telnet.c" />
-    <ClCompile Include="lib\tftp.c" />
-    <ClCompile Include="lib\timeval.c" />
-    <ClCompile Include="lib\transfer.c" />
-    <ClCompile Include="lib\url.c" />
-    <ClCompile Include="lib\version.c" />
-    <ClCompile Include="lib\warnless.c" />
-    <ClCompile Include="lib\wildcard.c" />
-    <ClCompile Include="lib\x509asn1.c" />
-    <ClCompile Include="lib\vtls\axtls.c" />
-    <ClCompile Include="lib\vtls\cyassl.c" />
-    <ClCompile Include="lib\vtls\darwinssl.c" />
-    <ClCompile Include="lib\vtls\gskit.c" />
-    <ClCompile Include="lib\vtls\gtls.c" />
-    <ClCompile Include="lib\vtls\mbedtls.c" />
-    <ClCompile Include="lib\vtls\nss.c" />
-    <ClCompile Include="lib\vtls\openssl.c" />
-    <ClCompile Include="lib\vtls\polarssl.c" />
-    <ClCompile Include="lib\vtls\polarssl_threadlock.c" />
-    <ClCompile Include="lib\vtls\schannel.c" />
-    <ClCompile Include="lib\vtls\vtls.c" />
-    <ClCompile Include="lib\vauth\cleartext.c" />
-    <ClCompile Include="lib\vauth\cram.c" />
-    <ClCompile Include="lib\vauth\digest.c" />
-    <ClCompile Include="lib\vauth\digest_sspi.c" />
-    <ClCompile Include="lib\vauth\krb5_gssapi.c" />
-    <ClCompile Include="lib\vauth\krb5_sspi.c" />
-    <ClCompile Include="lib\vauth\ntlm.c" />
-    <ClCompile Include="lib\vauth\ntlm_sspi.c" />
-    <ClCompile Include="lib\vauth\oauth2.c" />
-    <ClCompile Include="lib\vauth\spnego_gssapi.c" />
-    <ClCompile Include="lib\vauth\spnego_sspi.c" />
-    <ClCompile Include="lib\vauth\vauth.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="lib\amigaos.h" />
-    <ClInclude Include="lib\arpa_telnet.h" />
-    <ClInclude Include="lib\asyn.h" />
-    <ClInclude Include="lib\config-amigaos.h" />
-    <ClInclude Include="lib\config-dos.h" />
-    <ClInclude Include="lib\config-mac.h" />
-    <ClInclude Include="lib\config-os400.h" />
-    <ClInclude Include="lib\config-riscos.h" />
-    <ClInclude Include="lib\config-symbian.h" />
-    <ClInclude Include="lib\config-tpf.h" />
-    <ClInclude Include="lib\config-vxworks.h" />
-    <ClInclude Include="lib\config-win32.h" />
-    <ClInclude Include="lib\config-win32ce.h" />
-    <ClInclude Include="lib\conncache.h" />
-    <ClInclude Include="lib\connect.h" />
-    <ClInclude Include="lib\content_encoding.h" />
-    <ClInclude Include="lib\cookie.h" />
-    <ClInclude Include="lib\curl_addrinfo.h" />
-    <ClInclude Include="lib\curl_base64.h" />
-    <ClInclude Include="lib\curl_config.h" />
-    <ClInclude Include="lib\curl_des.h" />
-    <ClInclude Include="lib\curl_endian.h" />
-    <ClInclude Include="lib\curl_fnmatch.h" />
-    <ClInclude Include="lib\curl_gethostname.h" />
-    <ClInclude Include="lib\curl_gssapi.h" />
-    <ClInclude Include="lib\curl_hmac.h" />
-    <ClInclude Include="lib\curl_ldap.h" />
-    <ClInclude Include="lib\curl_md4.h" />
-    <ClInclude Include="lib\curl_md5.h" />
-    <ClInclude Include="lib\curl_memory.h" />
-    <ClInclude Include="lib\curl_memrchr.h" />
-    <ClInclude Include="lib\curl_multibyte.h" />
-    <ClInclude Include="lib\curl_ntlm_core.h" />
-    <ClInclude Include="lib\curl_ntlm_wb.h" />
-    <ClInclude Include="lib\curl_printf.h" />
-    <ClInclude Include="lib\curl_rtmp.h" />
-    <ClInclude Include="lib\curl_sasl.h" />
-    <ClInclude Include="lib\curl_sec.h" />
-    <ClInclude Include="lib\curl_setup.h" />
-    <ClInclude Include="lib\curl_setup_once.h" />
-    <ClInclude Include="lib\curl_sspi.h" />
-    <ClInclude Include="lib\curl_threads.h" />
-    <ClInclude Include="lib\curlx.h" />
-    <ClInclude Include="lib\dict.h" />
-    <ClInclude Include="lib\dotdot.h" />
-    <ClInclude Include="lib\easyif.h" />
-    <ClInclude Include="lib\escape.h" />
-    <ClInclude Include="lib\file.h" />
-    <ClInclude Include="lib\fileinfo.h" />
-    <ClInclude Include="lib\formdata.h" />
-    <ClInclude Include="lib\ftp.h" />
-    <ClInclude Include="lib\ftplistparser.h" />
-    <ClInclude Include="lib\getinfo.h" />
-    <ClInclude Include="lib\gopher.h" />
-    <ClInclude Include="lib\hash.h" />
-    <ClInclude Include="lib\hostcheck.h" />
-    <ClInclude Include="lib\hostip.h" />
-    <ClInclude Include="lib\http.h" />
-    <ClInclude Include="lib\http_chunks.h" />
-    <ClInclude Include="lib\http_digest.h" />
-    <ClInclude Include="lib\http_negotiate.h" />
-    <ClInclude Include="lib\http_ntlm.h" />
-    <ClInclude Include="lib\http_proxy.h" />
-    <ClInclude Include="lib\http2.h" />
-    <ClInclude Include="lib\if2ip.h" />
-    <ClInclude Include="lib\imap.h" />
-    <ClInclude Include="lib\inet_ntop.h" />
-    <ClInclude Include="lib\inet_pton.h" />
-    <ClInclude Include="lib\llist.h" />
-    <ClInclude Include="lib\memdebug.h" />
-    <ClInclude Include="lib\multihandle.h" />
-    <ClInclude Include="lib\multiif.h" />
-    <ClInclude Include="lib\netrc.h" />
-    <ClInclude Include="lib\non-ascii.h" />
-    <ClInclude Include="lib\nonblock.h" />
-    <ClInclude Include="lib\parsedate.h" />
-    <ClInclude Include="lib\pingpong.h" />
-    <ClInclude Include="lib\pipeline.h" />
-    <ClInclude Include="lib\pop3.h" />
-    <ClInclude Include="lib\progress.h" />
-    <ClInclude Include="lib\rawstr.h" />
-    <ClInclude Include="lib\rtsp.h" />
-    <ClInclude Include="lib\select.h" />
-    <ClInclude Include="lib\sendf.h" />
-    <ClInclude Include="lib\setup-os400.h" />
-    <ClInclude Include="lib\setup-vms.h" />
-    <ClInclude Include="lib\share.h" />
-    <ClInclude Include="lib\sigpipe.h" />
-    <ClInclude Include="lib\slist.h" />
-    <ClInclude Include="lib\smb.h" />
-    <ClInclude Include="lib\smtp.h" />
-    <ClInclude Include="lib\sockaddr.h" />
-    <ClInclude Include="lib\socks.h" />
-    <ClInclude Include="lib\speedcheck.h" />
-    <ClInclude Include="lib\splay.h" />
-    <ClInclude Include="lib\ssh.h" />
-    <ClInclude Include="lib\strdup.h" />
-    <ClInclude Include="lib\strequal.h" />
-    <ClInclude Include="lib\strerror.h" />
-    <ClInclude Include="lib\strtok.h" />
-    <ClInclude Include="lib\strtoofft.h" />
-    <ClInclude Include="lib\system_win32.h" />
-    <ClInclude Include="lib\telnet.h" />
-    <ClInclude Include="lib\tftp.h" />
-    <ClInclude Include="lib\timeval.h" />
-    <ClInclude Include="lib\transfer.h" />
-    <ClInclude Include="lib\url.h" />
-    <ClInclude Include="lib\urldata.h" />
-    <ClInclude Include="lib\warnless.h" />
-    <ClInclude Include="lib\wildcard.h" />
-    <ClInclude Include="lib\x509asn1.h" />
-    <ClInclude Include="lib\vtls\axtls.h" />
-    <ClInclude Include="lib\vtls\cyassl.h" />
-    <ClInclude Include="lib\vtls\darwinssl.h" />
-    <ClInclude Include="lib\vtls\gskit.h" />
-    <ClInclude Include="lib\vtls\gtls.h" />
-    <ClInclude Include="lib\vtls\mbedtls.h" />
-    <ClInclude Include="lib\vtls\nssg.h" />
-    <ClInclude Include="lib\vtls\openssl.h" />
-    <ClInclude Include="lib\vtls\polarssl.h" />
-    <ClInclude Include="lib\vtls\polarssl_threadlock.h" />
-    <ClInclude Include="lib\vtls\schannel.h" />
-    <ClInclude Include="lib\vtls\vtls.h" />
-    <ClInclude Include="lib\vauth\digest.h" />
-    <ClInclude Include="lib\vauth\ntlm.h" />
-    <ClInclude Include="lib\vauth\vauth.h" />
-    <ClInclude Include="include\curl\curl.h" />
-    <ClInclude Include="include\curl\curlbuild.h" />
-    <ClInclude Include="include\curl\curlrules.h" />
-    <ClInclude Include="include\curl\curlver.h" />
-    <ClInclude Include="include\curl\easy.h" />
-    <ClInclude Include="include\curl\mprintf.h" />
-    <ClInclude Include="include\curl\multi.h" />
-    <ClInclude Include="include\curl\stdcheaders.h" />
-    <ClInclude Include="include\curl\typecheck-gcc.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="lib\libcurl.rc" />
-  </ItemGroup>
-</Project>
diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj
index da2f4b4eb8..a6a6e1f7f1 100644
--- a/Externals/glslang/glslang.vcxproj
+++ b/Externals/glslang/glslang.vcxproj
@@ -35,12 +35,6 @@
     <Import Project="..\..\Source\VSProps\ClDisableAllWarnings.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile />
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="glslang\GenericCodeGen\CodeGen.cpp" />
     <ClCompile Include="glslang\GenericCodeGen\Link.cpp" />

From 88ccda17d34150f8407d63a701a52e3ecf8e5f3e Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 03:23:23 -0700
Subject: [PATCH 10/22] cubeb: don't define _MBCS or redefine
 _CRT_SECURE_NO_WARNINGS

---
 Externals/cubeb/msvc/cubeb.vcxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj
index 0e3cd94134..59585b0862 100644
--- a/Externals/cubeb/msvc/cubeb.vcxproj
+++ b/Externals/cubeb/msvc/cubeb.vcxproj
@@ -34,8 +34,8 @@
   </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>../include;../src;../msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;_CRT_SECURE_NO_WARNINGS;WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\src;..\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">

From 7537f8b8611799cda70100d41382ab725ee9df91 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 03:28:33 -0700
Subject: [PATCH 11/22] clarify a little in Base.props

---
 Source/VSProps/Base.props | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 7164db2b7c..76420ac32a 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -87,12 +87,16 @@
       <!--Enforce some behaviors as standards-conformant when they don't default as such-->
       <AdditionalOptions>/Zc:inline /volatile:iso %(AdditionalOptions)</AdditionalOptions>
       <!--Enable detailed debug info-->
-      <AdditionalOptions>/Zo /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
+      <!--Treat sources as utf-8-->
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
       <!--
-      This is for GetVersionEx being marked as depreciated - which is idiotic and there's
-      not much else we can do since many externals use it. The bad part is that there doesn't
-      seem to be a way to only ignore the specific instance we don't care about...
+      4996 is for GetVersionEx being marked as depreciated - which is idiotic and there's
+        not much else we can do since many externals use it. The bad part is that there doesn't
+        seem to be a way to only ignore the specific instance we don't care about...
+      4351 squashes a warning telling us the compiler is behaving as expected (instead of old,
+        broken behavior).
       -->
       <DisableSpecificWarnings>4996;4351</DisableSpecificWarnings>
     </ClCompile>

From a3caa14ade2862fcc76d8b3037229c564cf73242 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 04:08:37 -0700
Subject: [PATCH 12/22] remove duplicate code in msbuild files

---
 Source/Core/UICommon/UICommon.vcxproj           |  7 +------
 Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj | 11 +----------
 Source/Core/VideoCommon/VideoCommon.vcxproj     | 17 +----------------
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
index 6e0403fd0e..210dafc17d 100644
--- a/Source/Core/UICommon/UICommon.vcxproj
+++ b/Source/Core/UICommon/UICommon.vcxproj
@@ -35,12 +35,7 @@
     <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
index eed7820c19..d75aa38a9d 100644
--- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
+++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
@@ -35,19 +35,10 @@
     <Import Project="..\..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Lib />
-    <Lib />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Lib />
-    <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="BoundingBox.cpp" />
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index 994ef23223..e2802ae02c 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -35,25 +35,10 @@
     <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AsyncRequests.cpp" />

From bf3022ef2b4e307fdff4fecea7b4aa8602580b16 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 15:12:33 -0700
Subject: [PATCH 13/22] msvc: bump the required _MSC_FULL_VER

---
 Source/PCH/pch.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h
index 992a15ef29..f9cacdd23f 100644
--- a/Source/PCH/pch.h
+++ b/Source/PCH/pch.h
@@ -67,8 +67,8 @@
 
 #ifdef _WIN32
 
-#if _MSC_FULL_VER < 190023918
-#error Please update your build environment to Visual Studio 2015 Update 2 or later!
+#if _MSC_FULL_VER < 191025017
+#error Please update your build environment to the latest Visual Studio 2017!
 #endif
 
 #include <Windows.h>

From 0d1324af5065b6876ba669d21f8dfc09b25fd921 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 16:38:41 -0700
Subject: [PATCH 14/22] msvc: use pretty compiler diagnostics

---
 Source/VSProps/Base.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 76420ac32a..ef7b21cef7 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -91,6 +91,7 @@
       <!--Treat sources as utf-8-->
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <DiagnosticsFormat>Caret</DiagnosticsFormat>
       <!--
       4996 is for GetVersionEx being marked as depreciated - which is idiotic and there's
         not much else we can do since many externals use it. The bad part is that there doesn't

From 9ea7031042c97581cf12ea0e65ebbacccd533750 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 16:38:55 -0700
Subject: [PATCH 15/22] msvc: add /Zc:throwingNew

---
 Source/VSProps/Base.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index ef7b21cef7..76528cad11 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -85,7 +85,7 @@
       <!--Enable Standard Conformance-->
       <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
       <!--Enforce some behaviors as standards-conformant when they don't default as such-->
-      <AdditionalOptions>/Zc:inline /volatile:iso %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:inline /Zc:throwingNew /volatile:iso %(AdditionalOptions)</AdditionalOptions>
       <!--Enable detailed debug info-->
       <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
       <!--Treat sources as utf-8-->

From a6c102ba5ce9acb34a5e59cf1686794244e7494f Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 16:57:18 -0700
Subject: [PATCH 16/22] msbuild: remove extra zlib include from UICommon

---
 Source/Core/UICommon/UICommon.vcxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
index 210dafc17d..f0c141f623 100644
--- a/Source/Core/UICommon/UICommon.vcxproj
+++ b/Source/Core/UICommon/UICommon.vcxproj
@@ -37,7 +37,7 @@
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

From 7431dd3dcec740f2305a082f8c12601d1530d075 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 17:20:58 -0700
Subject: [PATCH 17/22] msbuild: make Externals inclusion methods uniform

---
 Source/Core/DolphinWX/DolphinWX.vcxproj         | 3 ---
 Source/Core/UICommon/UICommon.vcxproj           | 5 -----
 Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj | 5 -----
 Source/Core/VideoCommon/VideoCommon.vcxproj     | 5 -----
 Source/VSProps/Base.props                       | 7 +++++--
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
index d3545feb19..c472c2d3e1 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -46,9 +46,6 @@
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
     <Manifest>
       <AdditionalManifestFiles>DolphinWX.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
index f0c141f623..8b65ab9c25 100644
--- a/Source/Core/UICommon/UICommon.vcxproj
+++ b/Source/Core/UICommon/UICommon.vcxproj
@@ -35,11 +35,6 @@
     <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
index d75aa38a9d..531d2da843 100644
--- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
+++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
@@ -35,11 +35,6 @@
     <Import Project="..\..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="BoundingBox.cpp" />
     <ClCompile Include="CommandBufferManager.cpp" />
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index e2802ae02c..88d3e4b759 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -35,11 +35,6 @@
     <Import Project="..\..\VSProps\PCHUse.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="AsyncRequests.cpp" />
     <ClCompile Include="AVIDump.cpp" />
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 76528cad11..df2a08fefd 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -35,10 +35,13 @@
       <AdditionalIncludeDirectories>$(CoreDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)cubeb\include;$(ExternalsDir)cubeb\msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)curl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)enet\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)GL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)LZO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -46,8 +49,8 @@
       <AdditionalIncludeDirectories>$(ExternalsDir)mbedtls\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)SOIL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3;$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_FFMPEG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

From 09367c8c1064ac0f311b65c64ed278d7b46f466f Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 17:24:59 -0700
Subject: [PATCH 18/22] msbuild: remove more duplicate code

---
 Source/Core/DolphinQt2/DolphinQt2.vcxproj | 5 ++---
 Source/Core/DolphinWX/DolphinWX.vcxproj   | 4 ++--
 Source/UnitTests/UnitTests.vcxproj        | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
index 895009546f..5ecfb1cb0a 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
@@ -48,9 +48,8 @@
     <Link>
       <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Windows</SubSystem>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt</AdditionalOptions>
+      <!--TODO fix up ffmpeg garbage-->
+      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
index c472c2d3e1..60b43820a8 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -40,8 +40,8 @@
     <Link>
       <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
+      <!--TODO fix up ffmpeg garbage-->
+      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 48997f0eb3..dbab85e8fc 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -48,8 +48,8 @@
       <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\lib;$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
+      <!--TODO fix up ffmpeg garbage-->
+      <AdditionalOptions>/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

From 4f0c2df8a1cb211a02dbc2b291dd7267a113de4d Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 17:38:07 -0700
Subject: [PATCH 19/22] msbuild: wxw does not need xxhash to build

---
 Source/VSProps/WXWOverrides.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props
index 2d13bdbdc7..43e0512643 100644
--- a/Source/VSProps/WXWOverrides.props
+++ b/Source/VSProps/WXWOverrides.props
@@ -9,7 +9,7 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <ExceptionHandling>Async</ExceptionHandling>
       <PreprocessorDefinitions>WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\xxhash;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>

From 43dbb635d5963115ead0d91f7f36a8dfc6079c56 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 17:49:55 -0700
Subject: [PATCH 20/22] msbuild: remove more meaningless stuff

---
 Source/Core/DolphinQt2/DolphinQt2.vcxproj | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
index 5ecfb1cb0a..113637506c 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
@@ -54,13 +54,6 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ExternalsDir)/gettext</AdditionalIncludeDirectories>
-    </ResourceCompile>
     <Manifest>
       <AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>

From 7539259fb9a7c4dc5aec6a5a99d8065d4ffa1206 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 18:16:46 -0700
Subject: [PATCH 21/22] msbuild: EnableFiberSafeOptimizations is an opt.
 inhibitor; disable it.

---
 Source/VSProps/Base.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index df2a08fefd..fb6a33c58d 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -117,7 +117,6 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <BufferSecurityCheck>false</BufferSecurityCheck>

From 2a01945cf497e09729fc8b3a2c798b13022617ee Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Fri, 2 Jun 2017 18:28:22 -0700
Subject: [PATCH 22/22] msbuild: remove /EHa for wxw, which was just an old
 warning workaround

---
 Source/VSProps/WXWOverrides.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props
index 43e0512643..315142736d 100644
--- a/Source/VSProps/WXWOverrides.props
+++ b/Source/VSProps/WXWOverrides.props
@@ -7,7 +7,6 @@
       <!--Created in the vcxproj-->
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
-      <ExceptionHandling>Async</ExceptionHandling>
       <PreprocessorDefinitions>WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
     </ClCompile>