diff options
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/platform.lua | 7 | ||||
| -rw-r--r-- | xmake/scripts/platform/windows/_maker.lua | 7 |
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 |