summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-04-21 00:21:15 +0800
committerruki <[email protected]>2018-04-21 00:21:15 +0800
commit8ed8d76db7f0191d7c59a933546d153d437cdfa8 (patch)
tree67c8e457a9b626826aed40336f9202de4fd4c642
parentf7aa6e451f1197f59f6f6ca41cf76d200bef50f4 (diff)
improve target deps
-rw-r--r--xmake/core/project/target.lua17
1 files changed, 8 insertions, 9 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 5902df017..ba064b666 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -351,7 +351,7 @@ function target:options()
return self._OPTIONS
end
--- get the object file directory
+-- get the object files directory
function target:objectdir()
-- the object directory
@@ -361,18 +361,17 @@ function target:objectdir()
end
-- ok?
- return objectdir
+ return path.join(objectdir, config.get("mode") or "generic", config.get("arch") or os.arch())
+end
+
+-- get the dependent files directory
+function target:dependir()
+ return path.join(config.buildir(), ".deps", config.get("mode") or "generic", config.get("arch") or os.arch(), self:name())
end
-- get the target dependent file
function target:depfile()
-
- -- the target directory
- local targetdir = self:get("targetdir") or config.buildir()
- assert(targetdir and type(targetdir) == "string")
-
- -- make the dependent file path
- return path.join(targetdir, self:name() .. ".d")
+ return path.join(self:dependir(), self:name() .. ".d")
end
-- get the target kind