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

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

Browse Source
This commit is contained in:
Wojtek Figat
2022-07-15 20:36:56 +02:00
parent ee0f54434e 85f88efa95
commit 528a009b6b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/ShadersCompilation/DirectX/ShaderCompilerDX.Build.cs
View File

@@ -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");

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

@@ -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)
{