Merge pull request #5512 from shuffle2/vs-cleanup

VS cleanup

13 files changed, 48 insertions, 318 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 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 f9d83ae283..0000000000
--- a/Externals/cpp-optparse/cpp-optparse.vcxproj.filters
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.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/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'">
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
deleted file mode 100644
index bac5c47c7d..0000000000
--- a/Externals/curl/curl.vcxproj.filters
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.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/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 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" />

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/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/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" />
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/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_