From 2f593dcde7dee5a6a776703c9cdaa33af0b4abc5 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 12 Aug 2023 12:13:22 +0200 Subject: [PATCH] XMake: Fix double-compilation of shaders and recompile shaders on nzsl update Shaders were compiled twice because rule was added separately --- xmake.lua | 12 ------------ xmake/rules/compile_shaders.lua | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/xmake.lua b/xmake.lua index 76637233f..4668438a0 100644 --- a/xmake.lua +++ b/xmake.lua @@ -453,25 +453,13 @@ function ModuleTargetConfig(name, module) add_files("src/Nazara/" .. name .. "/**.cpp") if has_config("embed_resources") then - local embedResourceRule = false for _, filepath in pairs(os.files("src/Nazara/" .. name .. "/Resources/**|**.h|**.nzsl|**.nzslb")) do - if not embedResourceRule then - add_rules("embed.resources") - embedResourceRule = true - end - add_files(filepath, {rule = "embed.resources"}) end end if has_config("compile_shaders") then - local compileShaderRule = false for _, filepath in pairs(os.files("src/Nazara/" .. name .. "/Resources/**.nzsl")) do - if not compileShaderRule then - add_rules("nzsl.compile.shaders") - compileShaderRule = true - end - add_files(filepath, {rule = "nzsl.compile.shaders"}) end end diff --git a/xmake/rules/compile_shaders.lua b/xmake/rules/compile_shaders.lua index 346fcbff2..7ebb99e2e 100644 --- a/xmake/rules/compile_shaders.lua +++ b/xmake/rules/compile_shaders.lua @@ -38,6 +38,7 @@ rule("nzsl.compile.shaders") -- add deps batchcmds:add_depfiles(shaderfile) + batchcmds:add_depvalues(nzsl:version()) batchcmds:set_depmtime(os.mtime(outputFile)) batchcmds:set_depcache(target:dependfile(outputFile)) end)