Browse Source

Fixed Windows SDK selection when we cannot find VS reported version.

Fixes issue #636, thanks to @dowitdo for the debugging and fix.
pull/642/head
Joao Matos 10 years ago
parent
commit
ce62f5c4cc
  1. 5
      src/Core/Toolchains/MSVCToolchain.cs

5
src/Core/Toolchains/MSVCToolchain.cs

@ -178,6 +178,11 @@ namespace CppSharp
? windowsKitsSdks.Find(version => version.Value == kitsRootKey) ? windowsKitsSdks.Find(version => version.Value == kitsRootKey)
: windowsKitsSdks.Last(); : windowsKitsSdks.Last();
// If for some reason we cannot find the SDK version reported by VS
// in the system, then fallback to the latest version found.
if (windowsKitSdk.Value == null)
windowsKitSdk = windowsKitsSdks.Last();
includes.AddRange( includes.AddRange(
CollectUniversalCRuntimeIncludeDirs(vsDir, windowsKitSdk, windowsSdkMajorVer)); CollectUniversalCRuntimeIncludeDirs(vsDir, windowsKitSdk, windowsSdkMajorVer));

Loading…
Cancel
Save