summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-04 14:11:07 +0800
committerruki <[email protected]>2015-06-04 14:18:31 +0800
commit740fa0e8d4948a7261bcbb19fe7c3ac16f1df041 (patch)
treed998686f595a13bb012e17d84b4fabe93d76f8f4 /xmake/scripts/platform
parent1481ec887abef9ce33f4cff93f7a0e6ab04b5741 (diff)
add name argument for tools
Diffstat (limited to 'xmake/scripts/platform')
-rw-r--r--xmake/scripts/platform/windows/tools/nmake.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/xmake/scripts/platform/windows/tools/nmake.lua b/xmake/scripts/platform/windows/tools/nmake.lua
index 81a41df88..6d6b21258 100644
--- a/xmake/scripts/platform/windows/tools/nmake.lua
+++ b/xmake/scripts/platform/windows/tools/nmake.lua
@@ -68,7 +68,10 @@ function nmake._leave(name, old)
end
-- the init function
-function nmake.init()
+function nmake.init(name)
+
+ -- save name
+ nmake._NAME = name or "nmake.exe"
-- is verbose?
nmake._VERBOSE = utils.ifelse(xmake._OPTIONS.verbose, "-v", "")
@@ -87,9 +90,9 @@ function nmake.main(mkfile, target)
-- make command
local cmd = nil
if mkfile and os.isfile(mkfile) then
- cmd = string.format("nmake /f %s %s VERBOSE=%s 2> nul", mkfile, target or "", nmake._VERBOSE)
+ cmd = string.format("%s /f %s %s VERBOSE=%s 2> nul", nmake._NAME, mkfile, target or "", nmake._VERBOSE)
else
- cmd = string.format("nmake %s VERBOSE=%s 2> nul", target or "", nmake._VERBOSE)
+ cmd = string.format("%s %s VERBOSE=%s 2> nul", nmake._NAME, target or "", nmake._VERBOSE)
end
-- done