diff options
| author | ruki <[email protected]> | 2026-08-17 09:18:25 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-08-17 09:18:25 +0800 |
| commit | a6150b0a9bc7cd24081185a1d5acbd6772d5e138 (patch) | |
| tree | a7e047604b4ca2d5297a23664d52d59f70833b1e | |
| parent | e180e51cfb91f59ea6b4912e4d7bc052f5ef5add (diff) | |
| parent | b8cd13be1d019da3e69d80b3063068fd56a6f806 (diff) | |
Merge pull request #7713 from vkensou/patch-1
let hlsl2spv before module scan
| -rw-r--r-- | xmake/rules/utils/glsl2spv/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/rules/utils/hlsl2spv/xmake.lua | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xmake/rules/utils/glsl2spv/xmake.lua b/xmake/rules/utils/glsl2spv/xmake.lua index 01abc561a..0374c2fe6 100644 --- a/xmake/rules/utils/glsl2spv/xmake.lua +++ b/xmake/rules/utils/glsl2spv/xmake.lua @@ -43,6 +43,7 @@ -- rule("utils.glsl2spv") set_extensions(".vert", ".tesc", ".tese", ".geom", ".comp", ".frag", ".comp", ".mesh", ".task", ".rgen", ".rint", ".rahit", ".rchit", ".rmiss", ".rcall", ".glsl") + add_orders("utils.glsl2spv", "c++.build.modules.scanner") on_load(function (target) local is_bin2c = target:extraconf("rules", "utils.glsl2spv", "bin2c") if is_bin2c then @@ -53,7 +54,7 @@ rule("utils.glsl2spv") target:add("includedirs", headerdir) end end) - before_buildcmd_file(function (target, batchcmds, sourcefile_glsl, opt) + on_preparecmd_file(function (target, batchcmds, sourcefile_glsl, opt) import("lib.detect.find_tool") import("rules.utils.bin2obj.utils", {alias = "bin2obj_utils", rootdir = os.programdir()}) import("rules.utils.bin2c.utils", {alias = "bin2c_utils", rootdir = os.programdir()}) diff --git a/xmake/rules/utils/hlsl2spv/xmake.lua b/xmake/rules/utils/hlsl2spv/xmake.lua index 750574eac..5eab8b25d 100644 --- a/xmake/rules/utils/hlsl2spv/xmake.lua +++ b/xmake/rules/utils/hlsl2spv/xmake.lua @@ -43,6 +43,7 @@ -- rule("utils.hlsl2spv") set_extensions(".hlsl") + add_orders("utils.hlsl2spv", "c++.build.modules.scanner") on_load(function (target) local is_bin2c = target:extraconf("rules", "utils.hlsl2spv", "bin2c") if is_bin2c then @@ -54,7 +55,7 @@ rule("utils.hlsl2spv") end end) - before_buildcmd_file(function (target, batchcmds, sourcefile_hlsl, opt) + on_preparecmd_file(function (target, batchcmds, sourcefile_hlsl, opt) import("lib.detect.find_tool") import("rules.utils.bin2obj.utils", {alias = "bin2obj_utils", rootdir = os.programdir()}) import("rules.utils.bin2c.utils", {alias = "bin2c_utils", rootdir = os.programdir()}) |