diff options
| author | ruki <[email protected]> | 2017-06-29 20:03:38 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-06-29 20:03:38 +0800 |
| commit | 0f9ddb186bff17c0c430118860503532b72c5cce (patch) | |
| tree | 5984b9a7c5b82d9a2728d5f90a25127a6fc728b0 /xmake/plugins | |
| parent | cffdbf25772f185bdd86bb08705d0ddfe288bfb9 (diff) | |
fix some makefile bug
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/project/makefile/makefile.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/plugins/project/makefile/makefile.lua b/xmake/plugins/project/makefile/makefile.lua index 2efe09cea..e09b4edc1 100644 --- a/xmake/plugins/project/makefile/makefile.lua +++ b/xmake/plugins/project/makefile/makefile.lua @@ -248,7 +248,7 @@ function _make_target(makefile, target) makefile:print("") -- get linker kind - local linkerkind = target:linker():get("kind") + local linkerkind = target:linker():kind() -- get program local program = platform.tool(linkerkind) @@ -348,7 +348,7 @@ function _make_all(makefile) for sourcekind, sourcebatch in pairs(target:sourcebatches()) do makefile:print("%s_%s=%s", targetname, sourcekind:upper(), compiler.compflags(sourcebatch.sourcefiles, {target = target, sourcekind = sourcekind})) end - makefile:print("%s_%s=%s", targetname, target:linker():get("kind"):upper(), target:linkflags()) + makefile:print("%s_%s=%s", targetname, target:linker():kind():upper(), target:linkflags()) end end makefile:print("") diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index a134bbb90..e3aed1b88 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -56,7 +56,7 @@ function _make_targetinfo(mode, arch, target) end -- save linker flags - local _, linkflags = linker.linkflags(target:get("kinds"), target:sourcekinds()) + local _, linkflags = linker.linkflags(target:get("kind"), target:sourcekinds()) targetinfo.linkflags = linkflags -- ok |