diff options
| author | avaicode <[email protected]> | 2016-10-16 01:46:29 +0800 |
|---|---|---|
| committer | avaicode <[email protected]> | 2016-10-16 01:46:29 +0800 |
| commit | 80cc5ab406e425f6ffc5b8ce45e2980a4628c0d9 (patch) | |
| tree | 7b6d83ce3dbb0c047453ff45a9d770ca71f5c1a9 | |
| parent | 9ae41ea12f728c751646b8dc33109b0ee028ad4c (diff) | |
Removed dir repetitions after using full-name
| -rwxr-xr-x | tests/merge_object/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/target.lua | 2 |
2 files changed, 2 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 fa5e32e15..34b11b67c 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -284,7 +284,7 @@ function target:objectfiles() -- make object file -- 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")) + local objectfile = string.format("%s/%s/%s/%s", objectdir, self:name(), path.directory(sourcefile), target.filename(path.filename(sourcefile), "object")) -- translate path -- |