summaryrefslogtreecommitdiff
path: root/xmake/plugins/project
diff options
context:
space:
mode:
authorruki <[email protected]>2020-03-19 23:15:17 +0800
committerruki <[email protected]>2020-03-19 13:31:43 +0800
commit1933377f0050ac0b6722e5b598080323c75b6e41 (patch)
tree10125e87b5629f310920ea57a4d7f5a5ec126c99 /xmake/plugins/project
parent11d39769de12b3409fc3fcfac96bef1bb20cef2f (diff)
improve build_ninja
Diffstat (limited to 'xmake/plugins/project')
-rw-r--r--xmake/plugins/project/ninja/build_ninja.lua6
1 files changed, 6 insertions, 0 deletions
diff --git a/xmake/plugins/project/ninja/build_ninja.lua b/xmake/plugins/project/ninja/build_ninja.lua
index 407fc9184..7890e2790 100644
--- a/xmake/plugins/project/ninja/build_ninja.lua
+++ b/xmake/plugins/project/ninja/build_ninja.lua
@@ -225,6 +225,12 @@ function _add_build_for_target(ninjafile, target)
for _, objectfile in ipairs(objectfiles) do
ninjafile:write(" " .. objectfile)
end
+ -- merge objects with rule("utils.merge.object")
+ for _, sourcebatch in pairs(target:sourcebatches()) do
+ if sourcebatch.rulename == "utils.merge.object" then
+ ninjafile:write(" " .. table.concat(sourcebatch.sourcefiles, " "))
+ end
+ end
local deps = target:get("deps")
if deps then
ninjafile:print(" || $")