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

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source 
# Conflicts:
#	Source/Engine/Audio/Audio.cpp
This commit is contained in:
Wojtek Figat
2024-07-05 22:18:40 +02:00
parent 230c57cca4 009e1aaebb
commit 559cd74647
122 changed files with 8832 additions and 4272 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
/// </summary>
v10_0_22621_0,
/// <summary>
/// Windows 11 SDK (10.0.26100.0) 24H2
/// </summary>
v10_0_26100_0,
}
/// <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_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_26100_0: return new Version(10, 0, 26100, 0);
default: throw new ArgumentOutOfRangeException(nameof(sdk), sdk, null);
}
}
@@ -373,6 +379,7 @@ namespace Flax.Build.Platforms
WindowsPlatformSDK.v10_0_20348_0,
WindowsPlatformSDK.v10_0_22000_0,
WindowsPlatformSDK.v10_0_22621_0,
WindowsPlatformSDK.v10_0_26100_0,
};
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_22000_0:
case WindowsPlatformSDK.v10_0_22621_0:
case WindowsPlatformSDK.v10_0_26100_0:
{
var sdkVersionName = WindowsPlatformBase.GetSDKVersion(SDK).ToString();
string includeRootDir = Path.Combine(windowsSdkDir, "include", sdkVersionName);