From 023262647b42bab1c74fe948da61ac3564b2c2a7 Mon Sep 17 00:00:00 2001 From: triton Date: Thu, 25 Jun 2015 18:03:25 +0100 Subject: [PATCH] Workaround VS 2015 support since Clang cannot handle it yet. Errors: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xtr1common(227,22): error: use of undeclared identifier 'char16_t' C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xtr1common(233,22): error: use of undeclared identifier 'char32_t' C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xstddef(408,14):error: use of undeclared identifier 'char16_t' C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\xstddef(414,14):error: use of undeclared identifier 'char32_t' C:\Program Files (x86)\Windows Kits\8.1\include\um\winnt.h(938,2): error: Must define a target architecture. C:\Program Files (x86)\Windows Kits\8.1\include\um\oaidl.h(473,31): error: cannot combine with previous 'type-name' declaration specifier --- src/Core/Toolchains/MSVCToolchain.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Core/Toolchains/MSVCToolchain.cs b/src/Core/Toolchains/MSVCToolchain.cs index 1abb8fb8..9f0645cf 100644 --- a/src/Core/Toolchains/MSVCToolchain.cs +++ b/src/Core/Toolchains/MSVCToolchain.cs @@ -106,6 +106,11 @@ namespace CppSharp if (vsSdks.Count == 0) throw new Exception("Could not find a valid Visual Studio toolchain"); + // Clang cannot deal yet with VS 2015, so remove it from SDKs. + if (vsVersion == VisualStudioVersion.Latest) + vsSdks.Remove(vsSdks.Find(version => + (int) version.Version == GetVisualStudioVersion(vsVersion))); + var vsSdk = (vsVersion == VisualStudioVersion.Latest) ? vsSdks.Last() : vsSdks.Find(version =>