summaryrefslogtreecommitdiff
path: root/xmake/scripts/base/makefile.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2015-12-05 22:28:02 +0800
committerruki <[email protected]>2015-12-05 22:28:02 +0800
commit82fc443c84a02c7cf19248c5f9a70ef9f3a2032f (patch)
tree07189e5fefd41e23475c831d539d45e8b0e3af9c /xmake/scripts/base/makefile.lua
parentf77eb028a770969a3e87af41e41fe1e66b3b7842 (diff)
impl add_files *.lib for windows
Diffstat (limited to 'xmake/scripts/base/makefile.lua')
-rw-r--r--xmake/scripts/base/makefile.lua17
1 files changed, 1 insertions, 16 deletions
diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua
index 3304d95f7..522e62bad 100644
--- a/xmake/scripts/base/makefile.lua
+++ b/xmake/scripts/base/makefile.lua
@@ -97,23 +97,8 @@ function makefile._make_object_for_static(file, target, srcfile, objfile)
elseif mode == "profile" then mode = ".p"
else mode = "" end
- -- get the extractor tool name
- local toolname = platform.tool("ex")
- if not toolname then
- utils.error("cannot get extractor name!")
- return false
- end
-
- -- find the tool file path
- local toolpath = tools.find(toolname)
- if not toolpath or not os.isfile(toolpath) then
- utils.error("cannot get extractor path!")
- return false
- end
-
-- make command
- local cmd = string.format("xmake l dispatcher %s %s extract %s %s > %s 2>&1", toolname:encode(), toolpath:encode(), srcfile:encode(), objfile:encode(), makefile._LOGFILE)
--- local cmd = string.format("xmake l dispatcher %s %s extract %s %s", toolname:encode(), toolpath:encode(), srcfile:encode(), objfile:encode())
+ local cmd = string.format("xmake l -P %s -f %s dispatcher ex extract %s %s > %s 2>&1", xmake._PROJECT_DIR, xmake._PROJECT_FILE, srcfile:encode(), objfile:encode(), makefile._LOGFILE)
-- make head
file:write(string.format("%s:", objfile))