summaryrefslogtreecommitdiff
path: root/xmake/core/project/target.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-11-11 21:23:57 +0800
committerruki <[email protected]>2017-11-11 21:23:57 +0800
commitf50cc8971ad01966cb5bfbcd2bef354fdef42cd8 (patch)
tree69c6f0123120175998b581d362a568b3999f9f1b /xmake/core/project/target.lua
parentd8c3db4f8bd8a63eb1748bf1e0fd90001e318668 (diff)
improve project plugin
Diffstat (limited to 'xmake/core/project/target.lua')
-rw-r--r--xmake/core/project/target.lua10
1 files changed, 7 insertions, 3 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 49cbcdeae..23d65f384 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -543,7 +543,9 @@ function target:objectfiles()
-- get object files from source batches
local objectfiles = {}
for sourcekind, sourcebatch in pairs(self:sourcebatches()) do
- table.join2(objectfiles, sourcebatch.objectfiles)
+ if not sourcebatch.rulename then
+ table.join2(objectfiles, sourcebatch.objectfiles)
+ end
end
-- cache it
@@ -638,7 +640,9 @@ function target:incdepfiles()
-- get incdep files from source batches
local incdepfiles = {}
for sourcekind, sourcebatch in pairs(self:sourcebatches()) do
- table.join2(incdepfiles, sourcebatch.incdepfiles)
+ if not sourcebatch.rulename then
+ table.join2(incdepfiles, sourcebatch.incdepfiles)
+ end
end
-- cache it
@@ -752,7 +756,7 @@ function target:sourcebatches()
for sourcekind, sourcebatch in pairs(sourcebatches) do
-- skip source files with the custom rule
- if not sourcekind:startswith("__rule_") then
+ if not sourcebatch.rulename then
-- this batch support to compile multiple objects at the same time?
local instance = compiler.load(sourcekind)