From 8ed8d76db7f0191d7c59a933546d153d437cdfa8 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 21 Apr 2018 00:21:15 +0800 Subject: improve target deps --- xmake/core/project/target.lua | 17 ++++++++--------- 1 file 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 -- cgit v1.3.1