From 8ed7b0f45536658c4dae4b052a647382b39ac37f Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sun, 20 Mar 2022 18:26:33 +0200 Subject: [PATCH 1/2] Fix wrong library linkage in DirectXShaderCompiler --- .../Engine/ShadersCompilation/DirectX/ShaderCompilerDX.Build.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.Build.cs b/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.Build.cs index 0c2f581cf..dcf2d9b0e 100644 --- a/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.Build.cs +++ b/Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.Build.cs @@ -22,7 +22,7 @@ public class ShaderCompilerDX : ShaderCompiler options.PublicDefinitions.Add("COMPILE_WITH_DX_SHADER_COMPILER"); var depsRoot = options.DepsFolder; - options.OutputFiles.Add("dxcompiler.lib"); + options.OutputFiles.Add(Path.Combine(depsRoot, "dxcompiler.lib")); options.DependencyFiles.Add(Path.Combine(depsRoot, "dxcompiler.dll")); options.DependencyFiles.Add(Path.Combine(depsRoot, "dxil.dll")); options.DelayLoadLibraries.Add("dxcompiler.dll"); From 85f88efa95ebc74fe9dc6ddbf6811d792d0e07fe Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Sun, 20 Mar 2022 18:31:41 +0200 Subject: [PATCH 2/2] Enable support for latest Windows SDKs --- .../Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs b/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs index b056fb8ae..2d9468ca2 100644 --- a/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs +++ b/Source/Tools/Flax.Build/Platforms/Windows/WindowsPlatformBase.cs @@ -371,8 +371,8 @@ namespace Flax.Build.Platforms WindowsPlatformSDK.v10_0_17763_0, WindowsPlatformSDK.v10_0_18362_0, WindowsPlatformSDK.v10_0_19041_0, - //WindowsPlatformSDK.v10_0_20348_0, // Breaks on Flax Editor build - //WindowsPlatformSDK.v10_0_22000_0, // Breaks on Flax Editor build + WindowsPlatformSDK.v10_0_20348_0, + WindowsPlatformSDK.v10_0_22000_0, }; foreach (var sdk10 in sdk10Roots) {