From a9c57a3ca9b3cd4e94905e7b7429689273915f01 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 29 Jun 2020 23:04:57 +0800 Subject: improve target object file --- xmake/core/project/target.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 14409fec4..652ae4758 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -860,7 +860,11 @@ function _instance:autogenfile(sourcefile, opt) relativedir = relativedir:gsub(":[\\/]*", '\\') -- replace C:\xxx\ => C\xxx\ end relativedir = relativedir:gsub("%.%.", "__") - return path.join((opt and opt.rootdir) and opt.rootdir or self:autogendir(), relativedir, (opt and opt.filename) and opt.filename or path.filename(sourcefile)) + local rootdir = (opt and opt.rootdir) and opt.rootdir or self:autogendir() + if relativedir ~= "." then + rootdir = path.join(rootdir, relativedir) + end + return path.join(rootdir, (opt and opt.filename) and opt.filename or path.filename(sourcefile)) end -- get the target kind -- cgit v1.3.1