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

Merge branch 'winsdk_24h2' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-winsdk_24h2

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-02 09:05:08 +02:00
parent 1dfa92b0c3 16b0228394
commit d64108a5c1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,6 +130,11 @@ namespace Flax.Build.Platforms
/// Windows 11 SDK (10.0.22621.0) 22H2 /// Windows 11 SDK (10.0.22621.0) 22H2
/// </summary> /// </summary>
v10_0_22621_0, v10_0_22621_0,
/// <summary>
/// Windows 11 SDK (10.0.26100.0) 24H2
/// </summary>
v10_0_26100_0,
} }
/// <summary> /// <summary>
@@ -319,6 +324,7 @@ namespace Flax.Build.Platforms
case WindowsPlatformSDK.v10_0_20348_0: return new Version(10, 0, 20348, 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_22000_0: return new Version(10, 0, 22000, 0);
case WindowsPlatformSDK.v10_0_22621_0: return new Version(10, 0, 22621, 0); case WindowsPlatformSDK.v10_0_22621_0: return new Version(10, 0, 22621, 0);
case WindowsPlatformSDK.v10_0_26100_0: return new Version(10, 0, 26100, 0);
default: throw new ArgumentOutOfRangeException(nameof(sdk), sdk, null); default: throw new ArgumentOutOfRangeException(nameof(sdk), sdk, null);
} }
} }
@@ -373,6 +379,7 @@ namespace Flax.Build.Platforms
WindowsPlatformSDK.v10_0_20348_0, WindowsPlatformSDK.v10_0_20348_0,
WindowsPlatformSDK.v10_0_22000_0, WindowsPlatformSDK.v10_0_22000_0,
WindowsPlatformSDK.v10_0_22621_0, WindowsPlatformSDK.v10_0_22621_0,
WindowsPlatformSDK.v10_0_26100_0,
}; };
foreach (var sdk10 in sdk10Roots) foreach (var sdk10 in sdk10Roots)
{ {

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

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