summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoravaicode <[email protected]>2016-10-16 01:12:42 +0800
committeravaicode <[email protected]>2016-10-16 01:12:42 +0800
commit9ae41ea12f728c751646b8dc33109b0ee028ad4c (patch)
treeb27a549fbd60286789395bd239fa415e12c89b50
parentc33e1b20ce7b8b048fe8e1316eaa81e0e60bfc59 (diff)
Fixed a problem about name-clash of object file
-rw-r--r--xmake/core/project/target.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 1e687b8f2..fa5e32e15 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -283,7 +283,8 @@ function target:objectfiles()
sourcefile = sourcefile:gsub(target.filename("([%w_]+)", "static"):gsub("%.", "%%.") .. "$", "%1/*")
-- make object file
- local objectfile = string.format("%s/%s/%s/%s", objectdir, self:name(), path.directory(sourcefile), target.filename(path.basename(sourcefile), "object"))
+ -- full file name(not base) to avoid name-clash of object file
+ local objectfile = string.format("%s/%s/%s/%s", objectdir, self:name(), path.directory(sourcefile), target.filename(sourcefile, "object"))
-- translate path
--