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 @@ - + 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 @@ - - - - - - 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 @@ - - - - - - - - - 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 @@ - ../include;../src;../msvc;%(AdditionalIncludeDirectories) - _MBCS;_CRT_SECURE_NO_WARNINGS;WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions) + ..\include;..\src;..\msvc;%(AdditionalIncludeDirectories) + WIN32;USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions) 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 @@  - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@  - + {a5756b80-36f2-45f6-b1f1-b67082477376} 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 @@ - - - - - - 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 @@  - + glslang\GenericCodeGen 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 @@  - + Debug 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 @@ - + + true + - + + true + @@ -825,7 +829,9 @@ - + + true + @@ -907,7 +913,9 @@ true - + + true + @@ -918,10 +926,18 @@ - - - - + + true + + + true + + + true + + + true + true @@ -929,7 +945,9 @@ - + + true + true @@ -975,7 +993,9 @@ - + + true + @@ -1166,7 +1186,9 @@ - + + true + true @@ -1288,7 +1310,9 @@ - + + true + @@ -1371,16 +1395,13 @@ __WXDEBUG__;%(PreprocessorDefinitions) - - /ignore:4221 - - {01573c36-ac6e-49f6-94ba-572517eb9740} + {4C9F135B-A85E-430C-BAD4-4C67EF5FC12C} - {3e1339f5-9311-4122-9442-369702e8fcad} + {ff213b23-2c26-4214-9f88-85271e557e87} 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 @@ - + {ea19c29f-6825-47dc-b54d-ee464810b353} 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_ 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 @@ - + {25ec8f16-fc60-4a63-bc3e-ad0272fd5942} 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 @@  - + {0336df21-7c3f-48a9-b767-9cf11d8958a6} 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 @@  - + {e0d231ab-7a66-45ce-a8e4-c0225308f763} 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 @@  - + {3873659a-9a30-4a58-af9e-8dad7d7eb627} diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 888b126218..113637506c 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -48,20 +48,12 @@ $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories) 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) - Windows - /NODEFAULTLIB:libcmt - /NODEFAULTLIB:libcmt + + /NODEFAULTLIB:libcmt %(AdditionalOptions) $(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Settings;$(ProjectDir)\Config;$(ProjectDir)\Config\Mapping;%(AdditionalIncludeDirectories) - - - - - - $(ExternalsDir)/gettext - DolphinQt2.manifest;%(AdditionalManifestFiles) @@ -237,7 +229,7 @@ - + @@ -246,7 +238,7 @@ - + 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 @@  - + 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 @@  - + $(BinaryOutputDir)$(TargetFileName) WindowsLocalDebugger diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index d3545feb19..60b43820a8 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -40,15 +40,12 @@ $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\lib;%(AdditionalLibraryDirectories) 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) - /NODEFAULTLIB:libcmt %(AdditionalOptions) - /NODEFAULTLIB:libcmt %(AdditionalOptions) + + /NODEFAULTLIB:libcmt %(AdditionalOptions) $(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories) - - $(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) - DolphinWX.manifest;%(AdditionalManifestFiles) 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 @@ - + {0c0288ac-1168-4534-b3d3-051b9981f842} 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 @@  - + $(BinaryOutputDir)$(TargetFileName) 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 @@  - + {3a755a86-0efa-4396-bf79-bb3a1910764d} diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index 6e0403fd0e..8b65ab9c25 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -35,16 +35,6 @@ - - - $(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) - - - - - $(ExternalsDir)zlib;$(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) - - 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 @@  - + {ae700f7e-33c8-45b5-b7ee-a0ded3630549} 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 @@  - + {f29f8e7f-21ba-49da-8044-e5279a091c8f} diff --git a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj index eed7820c19..531d2da843 100644 --- a/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj +++ b/Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj @@ -35,20 +35,6 @@ - - - $(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories) - - - - - - - $(ExternalsDir)Vulkan\include;$(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;$(ExternalsDir)zlib;%(AdditionalIncludeDirectories) - - - - diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index 994ef23223..88d3e4b759 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -35,26 +35,6 @@ - - - $(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - - - - - $(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - - 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 @@  - + {23908fac-d3fd-4fa5-a9b4-87b3bafc7bd9} 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 @@ - + {0b70242b-1d98-432f-a60e-d4ca0674852e} 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 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 @@ $(ExternalsDir)OpenAL\lib;$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories) 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) Console - /NODEFAULTLIB:libcmt %(AdditionalOptions) - /NODEFAULTLIB:libcmt %(AdditionalOptions) + + /NODEFAULTLIB:libcmt %(AdditionalOptions) 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 @@  - + diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index fb2382ed08..fb6a33c58d 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -1,5 +1,5 @@  - + false @@ -35,10 +35,13 @@ $(CoreDir);%(AdditionalIncludeDirectories) $(ExternalsDir);%(AdditionalIncludeDirectories) $(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories) + $(ExternalsDir)cpp-optparse;%(AdditionalIncludeDirectories) $(ExternalsDir)cubeb\include;$(ExternalsDir)cubeb\msvc;%(AdditionalIncludeDirectories) $(ExternalsDir)curl\include;%(AdditionalIncludeDirectories) $(ExternalsDir)enet\include;%(AdditionalIncludeDirectories) + $(ExternalsDir)ffmpeg\include;%(AdditionalIncludeDirectories) $(ExternalsDir)GL;%(AdditionalIncludeDirectories) + $(ExternalsDir)glslang\glslang\Public;$(ExternalsDir)glslang\SPIRV;%(AdditionalIncludeDirectories) $(ExternalsDir)libpng;%(AdditionalIncludeDirectories) $(ExternalsDir)libusb\libusb;%(AdditionalIncludeDirectories) $(ExternalsDir)LZO;%(AdditionalIncludeDirectories) @@ -46,8 +49,8 @@ $(ExternalsDir)mbedtls\include;%(AdditionalIncludeDirectories) $(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories) $(ExternalsDir)SOIL;%(AdditionalIncludeDirectories) - $(ExternalsDir)wxWidgets3;%(AdditionalIncludeDirectories) - $(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories) + $(ExternalsDir)Vulkan\include;%(AdditionalIncludeDirectories) + $(ExternalsDir)wxWidgets3;$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories) $(ExternalsDir)xxhash;%(AdditionalIncludeDirectories) $(ExternalsDir)zlib;%(AdditionalIncludeDirectories) HAVE_FFMPEG;%(PreprocessorDefinitions) @@ -85,14 +88,19 @@ /permissive- %(AdditionalOptions) - /Zc:inline /volatile:iso %(AdditionalOptions) + /Zc:inline /Zc:throwingNew /volatile:iso %(AdditionalOptions) - /Zo /utf-8 %(AdditionalOptions) + /Zo %(AdditionalOptions) + + /utf-8 %(AdditionalOptions) OldStyle + Caret 4996;4351 @@ -109,7 +117,6 @@ AnySuitable Speed true - true true MultiThreadedDLL false 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props index 896dc0954d..bfca34c8d1 100644 --- a/Source/VSProps/QtCompile.props +++ b/Source/VSProps/QtCompile.props @@ -1,5 +1,5 @@ - + $(ExternalsDir)Qt\Qt5.8.0\5.8\msvc2015_64\ $(QTDIRDefault) @@ -138,7 +138,6 @@ 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 @@ - + QtResourceClean;QtUiClean;QtMocClean;$(CleanDependsOn) Use wx/wxprec.h - Async WXBUILDING;%(PreprocessorDefinitions) - ..\..\;..\..\include;..\..\..\xxhash;..\..\..\zlib;..\..\..\libpng + ..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions) diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 9c11d2fe96..7b560448ec 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -1,18 +1,13 @@ + 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}" - 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