GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add support for the latest Windows 11 SDK (22H2)

Browse Source 
#700
This commit is contained in:
Wojtek Figat
2022-07-15 23:32:19 +02:00
parent d586269eec
commit 5c5824bbb7
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs
View File

@@ -118,6 +118,11 @@ namespace Flax.Build.Platforms
/// Windows 11 SDK (10.0.22000.0)
/// </summary>
v10_0_22000_0,
/// <summary>
/// Windows 11 SDK (10.0.22621.0) 22H2
/// </summary>
v10_0_22621_0,
}
/// <summary>
@@ -236,11 +241,9 @@ namespace Flax.Build.Platforms
var toolsets = Directory.GetDirectories(rootDir);
foreach (var toolset in toolsets)
{
if (Version.TryParse(Path.GetFileName(toolset), out var version) && (
File.Exists(Path.Combine(toolset, "bin", "Hostx64", "x64", "cl.exe"))
||
File.Exists(Path.Combine(toolset, "bin", "Hostx86", "x64", "cl.exe"))
))
if (Version.TryParse(Path.GetFileName(toolset), out var version) &&
(File.Exists(Path.Combine(toolset, "bin", "Hostx64", "x64", "cl.exe")) ||
File.Exists(Path.Combine(toolset, "bin", "Hostx86", "x64", "cl.exe"))))
{
if (version.Major == 14 && version.Minor / 10 == 1)
_toolsets[WindowsPlatformToolset.v141] = toolset;
@@ -273,11 +276,9 @@ namespace Flax.Build.Platforms
if (vs2015 != null)
{
string rootDir = Path.Combine(vs2015.Path, "VC");
if (Directory.Exists(rootDir) && (
File.Exists(Path.Combine(rootDir, "bin", "amd64", "cl.exe"))
||
File.Exists(Path.Combine(rootDir, "bin", "x86_amd64", "cl.exe"))
))
if (Directory.Exists(rootDir) &&
(File.Exists(Path.Combine(rootDir, "bin", "amd64", "cl.exe")) ||
File.Exists(Path.Combine(rootDir, "bin", "x86_amd64", "cl.exe"))))
{
_toolsets[WindowsPlatformToolset.v140] = rootDir;
}
@@ -319,6 +320,7 @@ namespace Flax.Build.Platforms
case WindowsPlatformSDK.v10_0_19041_0: return new Version(10, 0, 19041, 0);
case WindowsPlatformSDK.v10_0_20348_0: return new Version(10, 0, 20348, 0);
case WindowsPlatformSDK.v10_0_22000_0: return new Version(10, 0, 22000, 0);
case WindowsPlatformSDK.v10_0_22621_0: return new Version(10, 0, 22621, 0);
default: throw new ArgumentOutOfRangeException(nameof(sdk), sdk, null);
}
}
@@ -373,6 +375,7 @@ namespace Flax.Build.Platforms
WindowsPlatformSDK.v10_0_19041_0,
WindowsPlatformSDK.v10_0_20348_0,
WindowsPlatformSDK.v10_0_22000_0,
WindowsPlatformSDK.v10_0_22621_0,
};
foreach (var sdk10 in sdk10Roots)
{

1
Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
View File

@@ -281,6 +281,7 @@ namespace Flax.Build.Platforms
case WindowsPlatformSDK.v10_0_19041_0:
case WindowsPlatformSDK.v10_0_20348_0:
case WindowsPlatformSDK.v10_0_22000_0:
case WindowsPlatformSDK.v10_0_22621_0:
{
var sdkVersionName = WindowsPlatformBase.GetSDKVersion(SDK).ToString();
string includeRootDir = Path.Combine(windowsSdkDir, "include", sdkVersionName);