diff options
Diffstat (limited to 'xmake/rules')
| -rw-r--r-- | xmake/rules/utils/bin2c/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/utils/glsl2spv/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/utils/hlsl2spv/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/xmake_cli/xmake.lua | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/xmake/rules/utils/bin2c/xmake.lua b/xmake/rules/utils/bin2c/xmake.lua index 9bed0f658..082e8fb5b 100644 --- a/xmake/rules/utils/bin2c/xmake.lua +++ b/xmake/rules/utils/bin2c/xmake.lua @@ -38,7 +38,7 @@ rule("utils.bin2c") -- add commands batchcmds:show_progress(opt.progress, "${color.build.object}generating.bin2c %s", sourcefile_bin) batchcmds:mkdir(headerdir) - local argv = {"lua", "private.utils.bin2c", "-i", path(sourcefile_bin), "-o", path(headerfile)} + local argv = {"-i", path(sourcefile_bin), "-o", path(headerfile)} local linewidth = target:extraconf("rules", "utils.bin2c", "linewidth") if linewidth then table.insert(argv, "-w") @@ -48,7 +48,7 @@ rule("utils.bin2c") if nozeroend then table.insert(argv, "--nozeroend") end - batchcmds:vrunv(os.programfile(), argv, {envs = {XMAKE_SKIP_HISTORY = "y"}}) + batchcmds:vlua("private.utils.bin2c", argv) -- add deps batchcmds:add_depfiles(sourcefile_bin) diff --git a/xmake/rules/utils/glsl2spv/xmake.lua b/xmake/rules/utils/glsl2spv/xmake.lua index 83988287e..dfd1779fe 100644 --- a/xmake/rules/utils/glsl2spv/xmake.lua +++ b/xmake/rules/utils/glsl2spv/xmake.lua @@ -85,8 +85,8 @@ rule("utils.glsl2spv") outputfile = headerfile -- add commands - local argv = {"lua", "private.utils.bin2c", "--nozeroend", "-i", path(spvfilepath), "-o", path(headerfile)} - batchcmds:vrunv(os.programfile(), argv, {envs = {XMAKE_SKIP_HISTORY = "y"}}) + local argv = {"--nozeroend", "-i", path(spvfilepath), "-o", path(headerfile)} + batchcmds:vlua("private.utils.bin2c", argv) end -- add deps diff --git a/xmake/rules/utils/hlsl2spv/xmake.lua b/xmake/rules/utils/hlsl2spv/xmake.lua index 7815290fb..2b285d893 100644 --- a/xmake/rules/utils/hlsl2spv/xmake.lua +++ b/xmake/rules/utils/hlsl2spv/xmake.lua @@ -85,8 +85,8 @@ rule("utils.hlsl2spv") outputfile = headerfile -- add commands - local argv = {"lua", "private.utils.bin2c", "--nozeroend", "-i", path(spvfilepath), "-o", path(headerfile)} - batchcmds:vrunv(os.programfile(), argv, {envs = {XMAKE_SKIP_HISTORY = "y"}}) + local argv = {"--nozeroend", "-i", path(spvfilepath), "-o", path(headerfile)} + batchcmds:vlua("private.utils.bin2c", argv) end batchcmds:add_depfiles(sourcefile_hlsl) diff --git a/xmake/rules/xmake_cli/xmake.lua b/xmake/rules/xmake_cli/xmake.lua index 6f599f9bd..d3a4b6f26 100644 --- a/xmake/rules/xmake_cli/xmake.lua +++ b/xmake/rules/xmake_cli/xmake.lua @@ -54,8 +54,8 @@ rule("xmake.cli") local headerdir = path.join(target:autogendir(), "rules", "xmake.cli", "include") local headerfile = path.join(headerdir, "luafiles.xmz.h") target:add("includedirs", headerdir) - argv = {"lua", "private.utils.bin2c", "--nozeroend", "-i", path(archivefile), "-o", path(headerfile)} - batchcmds:vrunv(os.programfile(), argv, {envs = {XMAKE_SKIP_HISTORY = "y"}}) + argv = {"--nozeroend", "-i", path(archivefile), "-o", path(headerfile)} + batchcmds:vlua("private.utils.bin2c", argv) batchcmds:add_depfiles(sourcefiles) batchcmds:set_depmtime(os.mtime(dependfile)) |