diff --git a/.gitignore b/.gitignore
index cb3b72d94..12cf8601f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@ CMakeLists.txt.user
*.kdev4
# Ignore IDEA/Clion files/dirs
/.idea/
+/Externals/ed25519/ed25519.log
+/Externals/picojson/picojson.log
diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj
index 2edc77a3c..42a2baf2d 100644
--- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj
+++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj
@@ -12,12 +12,12 @@
{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj
index 76b0f03ff..4a20d7f00 100644
--- a/Externals/LZO/LZO.vcxproj
+++ b/Externals/LZO/LZO.vcxproj
@@ -12,12 +12,12 @@
{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj
index 1a7fb04d3..72749e23a 100644
--- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj
+++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj
@@ -12,12 +12,12 @@
{93D73454-2512-424E-9CDA-4BB357FE13DD}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/SOIL/SOIL.vcxproj b/Externals/SOIL/SOIL.vcxproj
index 148802e51..51be43c83 100644
--- a/Externals/SOIL/SOIL.vcxproj
+++ b/Externals/SOIL/SOIL.vcxproj
@@ -12,12 +12,12 @@
{B441CC62-877E-4B3F-93E0-0DE80544F705}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/cpp-optparse/cpp-optparse.vcxproj b/Externals/cpp-optparse/cpp-optparse.vcxproj
index 57e5b86cb..22f3dd23b 100644
--- a/Externals/cpp-optparse/cpp-optparse.vcxproj
+++ b/Externals/cpp-optparse/cpp-optparse.vcxproj
@@ -12,12 +12,12 @@
{C636D9D1-82FE-42B5-9987-63B7D4836341}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj
index 1447c36f6..868fed5b8 100644
--- a/Externals/cubeb/msvc/cubeb.vcxproj
+++ b/Externals/cubeb/msvc/cubeb.vcxproj
@@ -12,12 +12,12 @@
{8EA11166-6512-44FC-B7A5-A4D1ECC81170}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
@@ -83,4 +83,4 @@
-
+
\ No newline at end of file
diff --git a/Externals/curl/curl.vcxproj b/Externals/curl/curl.vcxproj
index b62b65494..47a473096 100644
--- a/Externals/curl/curl.vcxproj
+++ b/Externals/curl/curl.vcxproj
@@ -286,12 +286,12 @@
{BB00605C-125F-4A21-B33B-7BF418322DCB}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/ed25519/ed25519.vcxproj b/Externals/ed25519/ed25519.vcxproj
index 027296149..08fb96bc3 100644
--- a/Externals/ed25519/ed25519.vcxproj
+++ b/Externals/ed25519/ed25519.vcxproj
@@ -33,12 +33,12 @@
{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/enet/enet.vcxproj b/Externals/enet/enet.vcxproj
index ac6fe790b..93df1c1bd 100644
--- a/Externals/enet/enet.vcxproj
+++ b/Externals/enet/enet.vcxproj
@@ -41,12 +41,12 @@
{CBC76802-C128-4B17-BF6C-23B08C313E5E}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/glslang/glslang.vcxproj b/Externals/glslang/glslang.vcxproj
index 79c65960c..87ecf2290 100644
--- a/Externals/glslang/glslang.vcxproj
+++ b/Externals/glslang/glslang.vcxproj
@@ -12,12 +12,12 @@
{D178061B-84D3-44F9-BEED-EFD18D9033F0}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj
index 4c842d172..25d3967de 100644
--- a/Externals/libpng/png/png.vcxproj
+++ b/Externals/libpng/png/png.vcxproj
@@ -12,12 +12,12 @@
{01573C36-AC6E-49F6-94BA-572517EB9740}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj
index 050d45955..6eae917be 100644
--- a/Externals/libusb/libusb_static_2013.vcxproj
+++ b/Externals/libusb/libusb_static_2013.vcxproj
@@ -13,12 +13,12 @@
libusb-1.0
{349EE8F9-7D25-4909-AAF5-FF3FADE72187}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/mbedtls/mbedTLS.vcxproj b/Externals/mbedtls/mbedTLS.vcxproj
index 43cc4127e..597475869 100644
--- a/Externals/mbedtls/mbedTLS.vcxproj
+++ b/Externals/mbedtls/mbedTLS.vcxproj
@@ -12,12 +12,12 @@
{46CF2D25-6A36-4189-B59C-E4815388E554}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj
index 4df6bab54..e73af26ea 100644
--- a/Externals/miniupnpc/miniupnpc.vcxproj
+++ b/Externals/miniupnpc/miniupnpc.vcxproj
@@ -12,12 +12,12 @@
{A680190D-0764-485B-9CF3-A82C5EDD5715}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/picojson/picojson.vcxproj b/Externals/picojson/picojson.vcxproj
index ccb76c7f6..709c71046 100644
--- a/Externals/picojson/picojson.vcxproj
+++ b/Externals/picojson/picojson.vcxproj
@@ -18,12 +18,12 @@
{2C0D058E-DE35-4471-AD99-E68A2CAF9E18}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/pugixml/pugixml.vcxproj b/Externals/pugixml/pugixml.vcxproj
index fbe495366..21660751b 100644
--- a/Externals/pugixml/pugixml.vcxproj
+++ b/Externals/pugixml/pugixml.vcxproj
@@ -12,12 +12,12 @@
{38FEE76F-F347-484B-949C-B4649381CFFB}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
@@ -45,4 +45,4 @@
-
+
\ No newline at end of file
diff --git a/Externals/soundtouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj
index c04fae41e..2336ffc9c 100644
--- a/Externals/soundtouch/SoundTouch.vcxproj
+++ b/Externals/soundtouch/SoundTouch.vcxproj
@@ -12,12 +12,12 @@
{68A5DD20-7057-448B-8FE0-B6AC8D205509}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
index 1e2bd889e..778567eaa 100644
--- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj
+++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
@@ -1367,12 +1367,12 @@
wxWidgets
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/xbrz/xbrz.vcxproj b/Externals/xbrz/xbrz.vcxproj
index 4bb9ac0dc..95460eb88 100644
--- a/Externals/xbrz/xbrz.vcxproj
+++ b/Externals/xbrz/xbrz.vcxproj
@@ -12,12 +12,12 @@
{869EA016-4458-2A45-25AF-DC44D6E98C0A}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/xxhash/xxhash.vcxproj b/Externals/xxhash/xxhash.vcxproj
index a486ff3c5..50737415e 100644
--- a/Externals/xxhash/xxhash.vcxproj
+++ b/Externals/xxhash/xxhash.vcxproj
@@ -12,12 +12,12 @@
{677EA016-1182-440C-9345-DC88D1E98C0C}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj
index 9495274f8..c0eea5f9a 100644
--- a/Externals/zlib/zlib.vcxproj
+++ b/Externals/zlib/zlib.vcxproj
@@ -12,12 +12,12 @@
{FF213B23-2C26-4214-9F88-85271E557E87}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj
index fb303ef37..46d6905d6 100644
--- a/Languages/Languages.vcxproj
+++ b/Languages/Languages.vcxproj
@@ -12,7 +12,7 @@
{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}
- 10.0.15063.0
+ 10.0
@@ -48,12 +48,12 @@
Utility
true
- v141
+ v142
Utility
false
- v141
+ v142
diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj
index ebbd10972..e4e9afe5c 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj
@@ -12,12 +12,12 @@
{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
@@ -81,4 +81,4 @@
-
+
\ No newline at end of file
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 80ce33890..c4d58d1ab 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -12,12 +12,12 @@
{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/Common/MathUtil.h b/Source/Core/Common/MathUtil.h
index 58aad3522..e56da6703 100644
--- a/Source/Core/Common/MathUtil.h
+++ b/Source/Core/Common/MathUtil.h
@@ -23,26 +23,6 @@ constexpr T SNANConstant()
return std::numeric_limits::signaling_NaN();
}
-#ifdef _MSC_VER
-
-// MSVC needs a workaround, because its std::numeric_limits::signaling_NaN()
-// will use __builtin_nans, which is improperly handled by the compiler and generates
-// a bad constant. Here we go back to the version MSVC used before the builtin.
-// TODO: Remove this and use numeric_limits directly whenever this bug is fixed.
-
-template <>
-constexpr double SNANConstant()
-{
- return (_CSTD _Snan._Double);
-}
-template <>
-constexpr float SNANConstant()
-{
- return (_CSTD _Snan._Float);
-}
-
-#endif
-
template
constexpr T Clamp(const T val, const T& min, const T& max)
{
diff --git a/Source/Core/Common/SCMRevGen.vcxproj b/Source/Core/Common/SCMRevGen.vcxproj
index 78795b8de..218a07e54 100644
--- a/Source/Core/Common/SCMRevGen.vcxproj
+++ b/Source/Core/Common/SCMRevGen.vcxproj
@@ -12,13 +12,13 @@
{69F00340-5C3D-449F-9A80-958435C6CF06}
- 10.0.15063.0
+ 10.0
Utility
false
- v141
+ v142
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 37e5f3539..623bef2eb 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -12,12 +12,12 @@
{8C60E805-0DA5-4E25-8F84-038DB504BB0D}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj
index 65a88dba9..b3d69d0b2 100644
--- a/Source/Core/DiscIO/DiscIO.vcxproj
+++ b/Source/Core/DiscIO/DiscIO.vcxproj
@@ -12,12 +12,12 @@
{B6398059-EBB6-4C34-B547-95F365B71FF4}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
index 05e1f2083..085949b35 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -13,12 +13,12 @@
{1B099EF8-6F87-47A2-A3E7-898A24584F49}
Dolphin
- 10.0.15063.0
+ 10.0
Application
- v141
+ v142
Unicode
@@ -300,4 +300,4 @@
-
+
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
index 555578615..a55939b17 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
@@ -154,9 +154,6 @@
GUI\Video
-
- Misc
-
GUI
@@ -381,9 +378,6 @@
GUI\Video
-
- Misc
-
Resources
@@ -507,4 +501,4 @@
-
+
\ No newline at end of file
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index 3d2c9b8c4..e9b679a8c 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -12,12 +12,12 @@
{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
index 4ee5a357c..749b0bf35 100644
--- a/Source/Core/UICommon/UICommon.vcxproj
+++ b/Source/Core/UICommon/UICommon.vcxproj
@@ -12,12 +12,12 @@
{604C8368-F34A-4D55-82C8-CC92A0C13254}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/Updater/Updater.vcxproj b/Source/Core/Updater/Updater.vcxproj
index 748e507ec..1c9b1ad0c 100644
--- a/Source/Core/Updater/Updater.vcxproj
+++ b/Source/Core/Updater/Updater.vcxproj
@@ -12,12 +12,12 @@
{E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}
- 10.0.15063.0
+ 10.0
Application
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
index 2108c69b5..77c227638 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
+++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
@@ -12,12 +12,12 @@
{570215B7-E32F-4438-95AE-C8D955F9FCA3}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoBackends/DX11/DX11.vcxproj b/Source/Core/VideoBackends/DX11/DX11.vcxproj
index f9e3d1468..f0d2ded60 100644
--- a/Source/Core/VideoBackends/DX11/DX11.vcxproj
+++ b/Source/Core/VideoBackends/DX11/DX11.vcxproj
@@ -12,12 +12,12 @@
{9A4C733C-BADE-4AC6-B58A-6E274395E90E}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoBackends/DX9/DX9.vcxproj b/Source/Core/VideoBackends/DX9/DX9.vcxproj
index b63c19d7b..1ae7085d1 100644
--- a/Source/Core/VideoBackends/DX9/DX9.vcxproj
+++ b/Source/Core/VideoBackends/DX9/DX9.vcxproj
@@ -12,12 +12,12 @@
{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
index feee2740c..f0a2e15e3 100644
--- a/Source/Core/VideoBackends/OGL/OGL.vcxproj
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj
@@ -12,12 +12,12 @@
{1909CD2D-1707-456F-86CA-0DF42A727C99}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj
index 79e900132..9b822cfef 100644
--- a/Source/Core/VideoBackends/Software/Software.vcxproj
+++ b/Source/Core/VideoBackends/Software/Software.vcxproj
@@ -12,12 +12,12 @@
{9E9DA440-E9AD-413C-B648-91030E792211}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
index c14963eaf..42e1a5e72 100644
--- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
+++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
@@ -12,12 +12,12 @@
{29F29A19-F141-45AD-9679-5A2923B49DA3}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index 089469502..34a402b37 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -13,12 +13,12 @@
{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
VideoCommon
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode
diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj
index d4dda2a2f..323302266 100644
--- a/Source/DSPTool/DSPTool.vcxproj
+++ b/Source/DSPTool/DSPTool.vcxproj
@@ -12,12 +12,12 @@
{1970D175-3DE8-4738-942A-4D98D1CDBF64}
- 10.0.15063.0
+ 10.0
Application
- v141
+ v142
Unicode
diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj
index 759812ef0..b316d9fd5 100644
--- a/Source/PCH/pch.vcxproj
+++ b/Source/PCH/pch.vcxproj
@@ -12,12 +12,12 @@
{76563A7F-1011-4EAD-B667-7BB18D09568E}
- 10.0.15063.0
+ 10.0
StaticLibrary
- v141
+ v142
Unicode