diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj
index a648aad1e6..02acca79fe 100644
--- a/Externals/libpng/png/png.vcxproj
+++ b/Externals/libpng/png/png.vcxproj
@@ -74,7 +74,7 @@
-
+
{ff213b23-2c26-4214-9f88-85271e557e87}
diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
index 09bb56032c..43c558299e 100644
--- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj
+++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj
@@ -1256,14 +1256,6 @@
true
-
-
- {01573c36-ac6e-49f6-94ba-572517eb9740}
-
-
- {3e1339f5-9311-4122-9442-369702e8fcad}
-
-
wxWidgets
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
@@ -1294,6 +1286,14 @@
__WXDEBUG__;%(PreprocessorDefinitions)
+
+
+ {01573c36-ac6e-49f6-94ba-572517eb9740}
+
+
+ {3e1339f5-9311-4122-9442-369702e8fcad}
+
+
diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj
index d80bed06d6..c626ffd77d 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj
@@ -68,10 +68,10 @@
-
+
{ec082900-b4d8-42e9-9663-77f02f6936ae}
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
index f82202c5da..b4628453ba 100644
--- a/Source/Core/AudioCommon/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -11,6 +11,10 @@
#if defined HAVE_OPENAL && HAVE_OPENAL
+#ifdef _WIN32
+#pragma comment(lib, "openal32.lib")
+#endif
+
static soundtouch::SoundTouch soundTouch;
//
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index 67f8a9a5a6..814ac4f04f 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -127,7 +127,7 @@
-
+
{bdb6578b-0691-4e80-a46c-df21639fd3b8}
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 3a72bd0f47..70fc5b8022 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -419,40 +419,43 @@
-
+
{8ada04d7-6db1-4da4-ab55-64fb12a0997b}
-
+
{349ee8f9-7d25-4909-aaf5-ff3fade72187}
-
+
{ab993f38-c31d-4897-b139-a620c42bc565}
-
+
+ {31643fdb-1bb8-4965-9de7-000fc88d35ae}
+
+
{bdb6578b-0691-4e80-a46c-df21639fd3b8}
-
+
{0a18a071-125e-442f-aff7-a3f68abecf99}
-
+
{93d73454-2512-424e-9cda-4bb357fe13dd}
-
+
{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
-
+
{41279555-f94f-4ebc-99de-af863c10c5c4}
-
+
{160bdc25-5626-4b0d-bdd8-2953d9777fb5}
-
+
{6bbd47cf-91fd-4077-b676-8b76980178a9}
-
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj
index e28d5b784d..f11b8e4aee 100644
--- a/Source/Core/DiscIO/DiscIO.vcxproj
+++ b/Source/Core/DiscIO/DiscIO.vcxproj
@@ -86,13 +86,13 @@
-
+
{bdb6578b-0691-4e80-a46c-df21639fd3b8}
-
+
{ff213b23-2c26-4214-9f88-85271e557e87}
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
index 69131eaefb..ea06cd5b53 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcxproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -40,11 +40,11 @@
0x00400000
false
true
- ..\..\..\Externals\SDL2-2.0.1\lib\$(PlatformName);..\..\..\Externals\OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)
- dsound.lib;iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;OpenAL32.lib;%(AdditionalDependencies)
+ $(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)
+ iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)
- ..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)
+ $(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)
@@ -152,58 +152,55 @@
-
+
-
+
{8ada04d7-6db1-4da4-ab55-64fb12a0997b}
-
+
{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}
-
+
{ab993f38-c31d-4897-b139-a620c42bc565}
-
- {31643fdb-1bb8-4965-9de7-000fc88d35ae}
-
-
+
{93d73454-2512-424e-9cda-4bb357fe13dd}
-
+
{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}
-
+
{ff213b23-2c26-4214-9f88-85271e557e87}
-
+
{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
-
+
{41279555-f94f-4ebc-99de-af863c10c5c4}
-
+
{e54cf649-140e-4255-81a5-30a673c1fb36}
-
+
{160bdc25-5626-4b0d-bdd8-2953d9777fb5}
-
+
{6bbd47cf-91fd-4077-b676-8b76980178a9}
-
+
{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}
-
+
{ec1a314c-5588-4506-9c1e-2e58e5817f75}
-
+
{a4c423aa-f57c-46c7-a172-d1a777017d29}
-
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
@@ -213,7 +210,7 @@
-
+
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index 2866846075..06e87bc55d 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -64,7 +64,7 @@
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
index 807018a67a..fd95e42b6d 100644
--- a/Source/Core/VideoBackends/D3D/D3D.vcxproj
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj
@@ -81,10 +81,10 @@
-
+
{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}
-
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
index 293213cb47..d770fbfa05 100644
--- a/Source/Core/VideoBackends/OGL/OGL.vcxproj
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj
@@ -98,13 +98,13 @@
-
+
{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}
-
+
{ff213b23-2c26-4214-9f88-85271e557e87}
-
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj
index eb36055da7..d0322a124d 100644
--- a/Source/Core/VideoBackends/Software/Software.vcxproj
+++ b/Source/Core/VideoBackends/Software/Software.vcxproj
@@ -88,10 +88,10 @@
-
+
{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}
-
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index d7b1fbdb08..9fd00d4deb 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -130,16 +130,16 @@
-
+
{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}
-
+
{b441cc62-877e-4b3f-93e0-0de80544f705}
-
+
{ff213b23-2c26-4214-9f88-85271e557e87}
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj
index a8cb4b32ba..d962c51247 100644
--- a/Source/DSPTool/DSPTool.vcxproj
+++ b/Source/DSPTool/DSPTool.vcxproj
@@ -53,10 +53,10 @@
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
-
+
{e54cf649-140e-4255-81a5-30a673c1fb36}
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index ab98569c86..a0ca4838bb 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -41,7 +41,6 @@
$(ExternalsDir)miniupnpc\src;%(AdditionalIncludeDirectories)
$(ExternalsDir)polarssl\include;%(AdditionalIncludeDirectories)
$(ExternalsDir)portaudio\include;%(AdditionalIncludeDirectories)
- $(ExternalsDir)SDL2-2.0.1\include;%(AdditionalIncludeDirectories)
$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)
$(ExternalsDir)SOIL;%(AdditionalIncludeDirectories)
$(ExternalsDir)wxWidgets3;%(AdditionalIncludeDirectories)