Browse Source

Refactored code to get VS SDK toolchain version in its own method.

pull/698/head
Joao Matos 9 years ago
parent
commit
cc773d1848
  1. 14
      src/Core/Toolchains/MSVCToolchain.cs

14
src/Core/Toolchains/MSVCToolchain.cs

@ -116,11 +116,8 @@ namespace CppSharp
} }
} }
/// Gets the system include folders for the given Visual Studio version. public static ToolchainVersion GetVSToolchain(VisualStudioVersion vsVersion)
public static List<string> GetSystemIncludes(VisualStudioVersion vsVersion)
{ {
var includes = new List<string>();
List<ToolchainVersion> vsSdks; List<ToolchainVersion> vsSdks;
GetVisualStudioSdks(out vsSdks); GetVisualStudioSdks(out vsSdks);
@ -132,10 +129,19 @@ namespace CppSharp
: vsSdks.Find(version => : vsSdks.Find(version =>
(int)version.Version == GetVisualStudioVersion(vsVersion)); (int)version.Version == GetVisualStudioVersion(vsVersion));
return vsSdk;
}
/// Gets the system include folders for the given Visual Studio version.
public static List<string> GetSystemIncludes(VisualStudioVersion vsVersion)
{
var vsSdk = GetVSToolchain(vsVersion);
var vsDir = vsSdk.Directory; var vsDir = vsSdk.Directory;
vsDir = vsDir.Substring(0, vsDir.LastIndexOf(@"\Common7\IDE", vsDir = vsDir.Substring(0, vsDir.LastIndexOf(@"\Common7\IDE",
StringComparison.Ordinal)); StringComparison.Ordinal));
var includes = new List<string>();
includes.Add(Path.Combine(vsDir, @"VC\include")); includes.Add(Path.Combine(vsDir, @"VC\include"));
// Check VCVarsQueryRegistry.bat to see which Windows SDK version // Check VCVarsQueryRegistry.bat to see which Windows SDK version

Loading…
Cancel
Save