summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-03 18:04:18 +0800
committerruki <[email protected]>2015-06-03 18:04:18 +0800
commit795001d9b03960d9a8fc290e6f6f9710f49c86bc (patch)
treecff700e27fc2e754b3a686d8d23f6b58a1792e6a /xmake/scripts/platform
parent81970742272dc8b6f406f91f216374777786d256 (diff)
impl verbose output for building
Diffstat (limited to 'xmake/scripts/platform')
-rw-r--r--xmake/scripts/platform/platform.lua7
-rw-r--r--xmake/scripts/platform/windows/_maker.lua7
2 files changed, 10 insertions, 4 deletions
diff --git a/xmake/scripts/platform/platform.lua b/xmake/scripts/platform/platform.lua
index 3748fa218..07a973dcd 100644
--- a/xmake/scripts/platform/platform.lua
+++ b/xmake/scripts/platform/platform.lua
@@ -298,12 +298,15 @@ function platform.build(mkfile, target)
return p._MAKER.done(mkfile, target)
end
+ -- is verbose?
+ local verbose = utils.ifelse(xmake._OPTIONS.verbose, "-v", "")
+
-- make command
local cmd = nil
if mkfile and os.isfile(mkfile) then
- cmd = string.format("make -j4 -f %s %s", mkfile, target or "")
+ cmd = string.format("make -j4 -f %s %s VERBOSE=%s", mkfile, target or "", verbose)
else
- cmd = string.format("make -j4 %s", target or "")
+ cmd = string.format("make -j4 %s VERBOSE=%s", target or "", verbose)
end
-- done
diff --git a/xmake/scripts/platform/windows/_maker.lua b/xmake/scripts/platform/windows/_maker.lua
index 40df24e17..81e8fd5de 100644
--- a/xmake/scripts/platform/windows/_maker.lua
+++ b/xmake/scripts/platform/windows/_maker.lua
@@ -76,12 +76,15 @@ function _maker.done(mkfile, target)
local includes = _maker._enter("include")
local libpathes = _maker._enter("libpath")
+ -- is verbose?
+ local verbose = utils.ifelse(xmake._OPTIONS.verbose, "-v", "")
+
-- make command
local cmd = nil
if mkfile and os.isfile(mkfile) then
- cmd = string.format("nmake /f %s %s 2> nul", mkfile, target or "")
+ cmd = string.format("nmake /f %s %s VERBOSE=%s 2> nul", mkfile, target or "", verbose)
else
- cmd = string.format("nmake %s 2> nul", target or "")
+ cmd = string.format("nmake %s VERBOSE=%s 2> nul", target or "", verbose)
end
-- done