Browse Source

Make Windows10SDK detection more robust

- fixes #1145
pull/1148/head
Dan Shechter 7 years ago committed by Dimitar Dobrev
parent
commit
c75d665310
  1. 10
      src/Core/Toolchains/MSVCToolchain.cs

10
src/Core/Toolchains/MSVCToolchain.cs

@ -637,11 +637,15 @@ namespace CppSharp @@ -637,11 +637,15 @@ namespace CppSharp
includes.Add(path + @"\VC\Tools\MSVC\" + version + @"\atlmfc\include");
}
var sdks = from package in packages
where package.GetId().Contains("Windows10SDK") || package.GetId().Contains("Windows81SDK") || package.GetId().Contains("Win10SDK_10")
where package.GetId().Contains("Windows10SDK") ||
package.GetId().Contains("Windows81SDK") ||
package.GetId().Contains("Win10SDK_10")
select package;
var win10sdks = from sdk in sdks
where sdk.GetId().Contains("Windows10SDK")
where regexWinSDK10Version.Match(sdk.GetId()).Success
orderby sdk.GetId()
select sdk;
var win8sdks = from sdk in sdks
where sdk.GetId().Contains("Windows81SDK")
select sdk;
@ -660,7 +664,7 @@ namespace CppSharp @@ -660,7 +664,7 @@ namespace CppSharp
}
else
{
path = "<invalid>";
throw new Exception("Windows10SDK should not have been detected, something is terribly wrong");
}
var shared = Path.Combine(path, "shared");
var um = Path.Combine(path, "um");

Loading…
Cancel
Save