diff options
| author | ruki <[email protected]> | 2016-10-16 08:48:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-10-16 08:48:53 +0800 |
| commit | c13a5bc0c081d6c312b58774bb07d5c39b8c2b8c (patch) | |
| tree | 7b6d83ce3dbb0c047453ff45a9d770ca71f5c1a9 | |
| parent | c33e1b20ce7b8b048fe8e1316eaa81e0e60bfc59 (diff) | |
| parent | 80cc5ab406e425f6ffc5b8ce45e2980a4628c0d9 (diff) | |
Merge pull request #38 from avaicode/dev
Fixed a problem about name-clash of object file
| -rwxr-xr-x | tests/merge_object/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/target.lua | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/merge_object/xmake.lua b/tests/merge_object/xmake.lua index 6be5eff44..b8f971536 100755 --- a/tests/merge_object/xmake.lua +++ b/tests/merge_object/xmake.lua @@ -41,5 +41,5 @@ target("test") -- add files add_files("src/test.c") - add_files("build/.objs/merge_object/src/interface.o") + add_files("build/.objs/merge_object/src/interface.c.o") diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 1e687b8f2..34b11b67c 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(path.filename(sourcefile), "object")) -- translate path -- |