diff --git a/Externals/Bochs_disasm/Bochs_disasm.vcxproj b/Externals/Bochs_disasm/Bochs_disasm.vcxproj index e1eb8d1949..b6d1cfa333 100644 --- a/Externals/Bochs_disasm/Bochs_disasm.vcxproj +++ b/Externals/Bochs_disasm/Bochs_disasm.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/LZO/LZO.vcxproj b/Externals/LZO/LZO.vcxproj index e89fde653c..97118d532c 100644 --- a/Externals/LZO/LZO.vcxproj +++ b/Externals/LZO/LZO.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/SFML/build/vc2010/SFML_Network.vcxproj b/Externals/SFML/build/vc2010/SFML_Network.vcxproj index d1382d30bc..efc40da491 100644 --- a/Externals/SFML/build/vc2010/SFML_Network.vcxproj +++ b/Externals/SFML/build/vc2010/SFML_Network.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode @@ -80,4 +80,4 @@ - + \ No newline at end of file diff --git a/Externals/SOIL/SOIL.vcxproj b/Externals/SOIL/SOIL.vcxproj index 77b61ff418..65a6d4f4f9 100644 --- a/Externals/SOIL/SOIL.vcxproj +++ b/Externals/SOIL/SOIL.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/enet/enet.vcxproj b/Externals/enet/enet.vcxproj index 74a77d3a91..f402fbfec5 100644 --- a/Externals/enet/enet.vcxproj +++ b/Externals/enet/enet.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -45,7 +45,7 @@ StaticLibrary - v120 + v140 Unicode @@ -66,4 +66,4 @@ - + \ No newline at end of file diff --git a/Externals/libpng/png/png.vcxproj b/Externals/libpng/png/png.vcxproj index e629708347..2d5eb90cd1 100644 --- a/Externals/libpng/png/png.vcxproj +++ b/Externals/libpng/png/png.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/libusb/libusb/os/threads_windows.h b/Externals/libusb/libusb/os/threads_windows.h index 2b829253b4..b28da25555 100644 --- a/Externals/libusb/libusb/os/threads_windows.h +++ b/Externals/libusb/libusb/os/threads_windows.h @@ -43,11 +43,16 @@ typedef struct usbi_cond_t_ usbi_cond_t; // We *were* getting timespec from pthread.h: #if (!defined(HAVE_STRUCT_TIMESPEC) && !defined(_TIMESPEC_DEFINED)) #define HAVE_STRUCT_TIMESPEC 1 +// (shuffle2) see https://github.com/libusb/libusb/pull/60 +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +#include +#else #define _TIMESPEC_DEFINED 1 struct timespec { long tv_sec; long tv_nsec; }; +#endif #endif /* HAVE_STRUCT_TIMESPEC | _TIMESPEC_DEFINED */ // We *were* getting ETIMEDOUT from pthread.h: diff --git a/Externals/libusb/libusb_static_2013.vcxproj b/Externals/libusb/libusb_static_2013.vcxproj index 9e0711de55..f389ea7eed 100644 --- a/Externals/libusb/libusb_static_2013.vcxproj +++ b/Externals/libusb/libusb_static_2013.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -17,7 +17,7 @@ StaticLibrary - v120 + v140 Unicode @@ -67,4 +67,4 @@ - + \ No newline at end of file diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj index 7f832784a9..a9f1a55b27 100644 --- a/Externals/miniupnpc/miniupnpc.vcxproj +++ b/Externals/miniupnpc/miniupnpc.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/msvcrt/x64/msvcp120.dll b/Externals/msvcrt/x64/msvcp120.dll deleted file mode 100644 index 4ea1efa734..0000000000 Binary files a/Externals/msvcrt/x64/msvcp120.dll and /dev/null differ diff --git a/Externals/msvcrt/x64/msvcr120.dll b/Externals/msvcrt/x64/msvcr120.dll deleted file mode 100644 index d711c92232..0000000000 Binary files a/Externals/msvcrt/x64/msvcr120.dll and /dev/null differ diff --git a/Externals/polarssl/visualc/PolarSSL.vcxproj b/Externals/polarssl/visualc/PolarSSL.vcxproj index 843b4c8c5f..7b7ff30808 100644 --- a/Externals/polarssl/visualc/PolarSSL.vcxproj +++ b/Externals/polarssl/visualc/PolarSSL.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode @@ -110,4 +110,4 @@ - + \ No newline at end of file diff --git a/Externals/portaudio/build/portaudio.vcxproj b/Externals/portaudio/build/portaudio.vcxproj index 38c6a907ec..d8d435c991 100644 --- a/Externals/portaudio/build/portaudio.vcxproj +++ b/Externals/portaudio/build/portaudio.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/soundtouch/SoundTouch.vcxproj b/Externals/soundtouch/SoundTouch.vcxproj index ebcaba69f1..17590bd2e6 100644 --- a/Externals/soundtouch/SoundTouch.vcxproj +++ b/Externals/soundtouch/SoundTouch.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/wxWidgets3/build/msw/wx_base.vcxproj b/Externals/wxWidgets3/build/msw/wx_base.vcxproj index a8e473b01a..9550852f37 100644 --- a/Externals/wxWidgets3/build/msw/wx_base.vcxproj +++ b/Externals/wxWidgets3/build/msw/wx_base.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -698,7 +698,9 @@ - + + true + @@ -726,7 +728,9 @@ - + + true + @@ -778,7 +782,9 @@ true - + + true + true @@ -807,7 +813,9 @@ - + + true + true @@ -892,7 +900,9 @@ - + + true + @@ -917,7 +927,9 @@ - + + true + @@ -951,14 +963,20 @@ true - - + + true + + + true + - + + true + @@ -975,23 +993,31 @@ - + + true + - + + true + - + + true + true - + + true + @@ -1035,7 +1061,9 @@ true - + + true + @@ -1057,7 +1085,9 @@ - + + true + @@ -1090,9 +1120,13 @@ - + + true + - + + true + @@ -1104,14 +1138,18 @@ - + + true + - + + true + @@ -1126,18 +1164,24 @@ - + + true + - + + true + - + + true + true @@ -1156,7 +1200,9 @@ - + + true + true @@ -1169,7 +1215,9 @@ - + + true + @@ -1224,7 +1272,9 @@ - + + true + @@ -1255,7 +1305,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Externals/wxWidgets3/include/wx/compiler.h b/Externals/wxWidgets3/include/wx/compiler.h index 5ad4df8561..0be92d7da7 100644 --- a/Externals/wxWidgets3/include/wx/compiler.h +++ b/Externals/wxWidgets3/include/wx/compiler.h @@ -53,6 +53,9 @@ # define __VISUALC11__ #elif __VISUALC__ < 1900 # define __VISUALC12__ +#elif __VISUALC__ < 2000 + /* There is no __VISUALC13__! */ +# define __VISUALC14__ #else # pragma message("Please update wx/compiler.h to recognize this VC++ version") #endif @@ -102,7 +105,13 @@ # define wxVISUALC_VERSION(major) 0 # define wxCHECK_VISUALC_VERSION(major) 0 #else -# define wxVISUALC_VERSION(major) ( (6 + major) * 100 ) + /* + Things used to be simple with the _MSC_VER value and the version number + increasing in lock step, but _MSC_VER value of 1900 is VC14 and not the + non existing (presumably for the superstitious reasons) VC13, so we now + need to account for this with an extra offset. + */ +# define wxVISUALC_VERSION(major) ( (6 + (major >= 14 ? 1 : 0) + major) * 100 ) # define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) ) #endif diff --git a/Externals/wxWidgets3/wx/wxmsw.h b/Externals/wxWidgets3/wx/wxmsw.h index 93950bf567..40ad33a41b 100644 --- a/Externals/wxWidgets3/wx/wxmsw.h +++ b/Externals/wxWidgets3/wx/wxmsw.h @@ -1247,8 +1247,8 @@ // Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. // // Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 +#define wxUSE_METAFILE 0 +#define wxUSE_ENH_METAFILE 0 #define wxUSE_WIN_METAFILES_ALWAYS 0 // ---------------------------------------------------------------------------- diff --git a/Externals/xxhash/xxhash.vcxproj b/Externals/xxhash/xxhash.vcxproj index f3325aec38..4e43687eb7 100644 --- a/Externals/xxhash/xxhash.vcxproj +++ b/Externals/xxhash/xxhash.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode @@ -50,4 +50,4 @@ - + \ No newline at end of file diff --git a/Externals/zlib/zlib.vcxproj b/Externals/zlib/zlib.vcxproj index 748df1963d..eb8d2846f4 100644 --- a/Externals/zlib/zlib.vcxproj +++ b/Externals/zlib/zlib.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 49b39701f7..2577ffe76e 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -44,12 +44,12 @@ Utility true - v120 + v140 Utility false - v120 + v140 diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj index 13aa887e32..bba0c496c9 100644 --- a/Source/Core/AudioCommon/AudioCommon.vcxproj +++ b/Source/Core/AudioCommon/AudioCommon.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index cd02192c86..fcf1bdb3e4 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -33,11 +33,9 @@ #define IsTriviallyCopyable(T) std::is_trivially_copyable::type>::value #elif __GNUC__ #define IsTriviallyCopyable(T) std::has_trivial_copy_constructor::value -#elif _MSC_VER >= 1800 -// work around bug -#define IsTriviallyCopyable(T) (std::is_trivially_copyable::value || std::is_pod::value) -#elif defined(_MSC_VER) -#define IsTriviallyCopyable(T) std::has_trivial_copy::value +#elif _MSC_VER +// (shuffle2) see https://github.com/dolphin-emu/dolphin/pull/2218 +#define IsTriviallyCopyable(T) 1 #else #error No version of is_trivially_copyable #endif diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj index 13f1cfba18..9303e37939 100644 --- a/Source/Core/Common/Common.vcxproj +++ b/Source/Core/Common/Common.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index 52ce71a540..8e039b6066 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -102,12 +102,6 @@ extern "C" __declspec(dllimport) void __stdcall DebugBreak(void); } #define Crash() {DebugBreak();} - - #if (_MSC_VER > 1800) - #error alignof compat can be removed - #else - #define alignof(x) __alignof(x) - #endif #endif // WIN32 ndef // Generic function to get last error message. diff --git a/Source/Core/Common/Event.h b/Source/Core/Common/Event.h index db98ce1574..e05bafac1f 100644 --- a/Source/Core/Common/Event.h +++ b/Source/Core/Common/Event.h @@ -24,9 +24,6 @@ namespace Common { -// Windows uses a specific implementation because std::condition_variable has -// terrible performance for this kind of workload with MSVC++ 2013. -#ifndef _WIN32 class Event final { public: @@ -76,39 +73,5 @@ private: std::condition_variable m_condvar; std::mutex m_mutex; }; -#else -class Event final -{ -public: - void Set() - { - m_event.set(); - } - - void Wait() - { - m_event.wait(); - m_event.reset(); - } - - template - bool WaitFor(const std::chrono::duration& rel_time) - { - bool signaled = m_event.wait( - (u32)std::chrono::duration_cast(rel_time).count() - ) == 0; - m_event.reset(); - return signaled; - } - - void Reset() - { - m_event.reset(); - } - -private: - concurrency::event m_event; -}; -#endif } // namespace Common diff --git a/Source/Core/Common/Flag.h b/Source/Core/Common/Flag.h index f2ed128f5a..846f953280 100644 --- a/Source/Core/Common/Flag.h +++ b/Source/Core/Common/Flag.h @@ -56,11 +56,7 @@ public: } private: - // We are not using std::atomic_bool here because MSVC sucks as of VC++ - // 2013 and does not implement the std::atomic_bool(bool) constructor. - // - // Re-evaluate next time we upgrade that piece of shit. - std::atomic m_val; + std::atomic_bool m_val; }; } // namespace Common diff --git a/Source/Core/Common/SCMRevGen.vcxproj b/Source/Core/Common/SCMRevGen.vcxproj index d642b0c565..4839c9407b 100644 --- a/Source/Core/Common/SCMRevGen.vcxproj +++ b/Source/Core/Common/SCMRevGen.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -17,7 +17,7 @@ Utility false - v120 + v140 diff --git a/Source/Core/Common/make_scmrev.h.js b/Source/Core/Common/make_scmrev.h.js index 97c68cc923..1d5fa902f4 100644 --- a/Source/Core/Common/make_scmrev.h.js +++ b/Source/Core/Common/make_scmrev.h.js @@ -28,6 +28,17 @@ function GetGitExe() {} } + // last try - msysgit not in path (vs2015 default) + msyspath = "\\Git\\cmd\\git.exe"; + gitexe = wshShell.ExpandEnvironmentStrings("%PROGRAMFILES(x86)%") + msyspath; + if (oFS.FileExists(gitexe)) { + return gitexe; + } + gitexe = wshShell.ExpandEnvironmentStrings("%PROGRAMFILES%") + msyspath; + if (oFS.FileExists(gitexe)) { + return gitexe; + } + WScript.Echo("Cannot find git or git.cmd, check your PATH:\n" + wshShell.ExpandEnvironmentStrings("%PATH%")); WScript.Quit(1); diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h index d444724705..8070d70212 100644 --- a/Source/Core/Common/x64Emitter.h +++ b/Source/Core/Common/x64Emitter.h @@ -954,8 +954,7 @@ public: template void ABI_CallLambdaC(const std::function* f, u32 p1) { - // Double casting is required by VC++ for some reason. - auto trampoline = (void(*)())&XEmitter::CallLambdaTrampoline; + auto trampoline = &XEmitter::CallLambdaTrampoline; ABI_CallFunctionPC((void*)trampoline, const_cast((const void*)f), p1); } }; // class XEmitter diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index 335d505c62..e6d9c3851d 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj index b0a9ef63fd..3250c37531 100644 --- a/Source/Core/DiscIO/DiscIO.vcxproj +++ b/Source/Core/DiscIO/DiscIO.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index d60849aeae..718cdee343 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -20,7 +20,7 @@ Application - v120 + v140 Unicode @@ -162,7 +162,7 @@ - + diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj.filters b/Source/Core/DolphinQt/DolphinQt.vcxproj.filters index 368869def9..a12868061c 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj.filters +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj.filters @@ -54,12 +54,19 @@ + + + + GameList + + + diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index 3ecb72fa13..b4818cf162 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -17,7 +17,7 @@ Application - v120 + v140 Unicode @@ -234,7 +234,7 @@ - + diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index 1ef940178e..347c06e770 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index cd542b24c1..24f4a1cfc5 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj index 37299fdfa4..bf3229c3df 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index 2d2cf22cae..820f5b6219 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode @@ -115,4 +115,4 @@ - + \ No newline at end of file diff --git a/Source/Core/VideoBackends/Software/Software.vcxproj b/Source/Core/VideoBackends/Software/Software.vcxproj index 4fa9e6971c..161154df62 100644 --- a/Source/Core/VideoBackends/Software/Software.vcxproj +++ b/Source/Core/VideoBackends/Software/Software.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj index ff56a97703..98eecf8542 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode @@ -162,4 +162,4 @@ - + \ No newline at end of file diff --git a/Source/DSPTool/DSPTool.vcxproj b/Source/DSPTool/DSPTool.vcxproj index d962c51247..0bc3805911 100644 --- a/Source/DSPTool/DSPTool.vcxproj +++ b/Source/DSPTool/DSPTool.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ Application - v120 + v140 Unicode diff --git a/Source/PCH/pch.vcxproj b/Source/PCH/pch.vcxproj index 8959e7f180..a483f68667 100644 --- a/Source/PCH/pch.vcxproj +++ b/Source/PCH/pch.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ StaticLibrary - v120 + v140 Unicode diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj index a67c8e5ac0..42441538cf 100644 --- a/Source/UnitTests/UnitTests.vcxproj +++ b/Source/UnitTests/UnitTests.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -16,7 +16,7 @@ Application - v120 + v140 Unicode diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props index 0bbef70b88..4730347a86 100644 --- a/Source/VSProps/Base.props +++ b/Source/VSProps/Base.props @@ -23,7 +23,6 @@ $(BuildRootDir)$(Platform)\$(Configuration)\$(ProjectName)\ $(IntDir)bin\ $(ProjectName)$(TargetSuffix) - $(VC_IncludePath);$(WindowsSDK_IncludePath) diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 91b1c72ee9..b76f08f3e9 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}" EndProject