summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Leclercq <[email protected]>2022-04-06 08:53:15 +0200
committerGitHub <[email protected]>2022-04-06 08:53:15 +0200
commit1a38d758f48624c09d2e16d1df360909a8046e61 (patch)
tree4ef53d16f6859ea13194eb9bbff9d87bc0892e0a
parent0cef8c0d987bc3c0020c4311b0207de6630b9d5a (diff)
Update vs201x.lua
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua
index 2c47f42f0..e4b5596b5 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x.lua
@@ -111,7 +111,7 @@ function _get_command_string(cmd, vcxprojdir)
end
-- add target custom commands for target
-function _make_custom_commands_for_target(commands, target, suffix, vcxprojdir)
+function _make_custom_commands_for_target(commands, target, vcxprojdir, suffix)
for _, ruleinst in ipairs(target:orderules()) do
local scriptname = "buildcmd" .. (suffix and ("_" .. suffix) or "")
local script = ruleinst:script(scriptname)
@@ -150,7 +150,7 @@ function _make_custom_commands_for_target(commands, target, suffix, vcxprojdir)
end
-- add target custom commands for object rules
-function _make_custom_commands_for_objectrules(commands, target, sourcebatch, suffix, vcxprojdir)
+function _make_custom_commands_for_objectrules(commands, target, sourcebatch, vcxprojdir, suffix)
-- get rule
local rulename = assert(sourcebatch.rulename, "unknown rule for sourcebatch!")
@@ -201,17 +201,17 @@ end
-- make custom commands
function _make_custom_commands(target, vcxprojdir)
local commands = {}
- _make_custom_commands_for_target(commands, target, "before", vcxprojdir)
- _make_custom_commands_for_target(commands, target, nil, vcxprojdir)
+ _make_custom_commands_for_target(commands, target, vcxprojdir, "before")
+ _make_custom_commands_for_target(commands, target, vcxprojdir)
for _, sourcebatch in pairs(target:sourcebatches()) do
local sourcekind = sourcebatch.sourcekind
if sourcekind ~= "cc" and sourcekind ~= "cxx" and sourcekind ~= "as" then
- _make_custom_commands_for_objectrules(commands, target, sourcebatch, "before", vcxprojdir)
- _make_custom_commands_for_objectrules(commands, target, sourcebatch, nil, vcxprojdir)
- _make_custom_commands_for_objectrules(commands, target, sourcebatch, "after", vcxprojdir)
+ _make_custom_commands_for_objectrules(commands, target, sourcebatch, vcxprojdir, "before")
+ _make_custom_commands_for_objectrules(commands, target, sourcebatch, vcxprojdir, nil)
+ _make_custom_commands_for_objectrules(commands, target, sourcebatch, vcxprojdir, "after")
end
end
- _make_custom_commands_for_target(commands, target, "after", vcxprojdir)
+ _make_custom_commands_for_target(commands, target, vcxprojdir, "after")
return commands
end