summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-02-09 23:16:49 +0800
committerruki <[email protected]>2020-02-09 23:16:49 +0800
commit3d9793b409408ff451c3cce49043bb827d715b3b (patch)
treed24d767004aa4137746e105d754b0fc11e10d5b0
parent204d204c230eccfa459752c71ca3651522ecefcd (diff)
fix check tip colors
-rw-r--r--xmake/modules/private/platform/check_arch.lua2
-rw-r--r--xmake/modules/private/platform/check_vstudio.lua4
-rw-r--r--xmake/platforms/windows/config.lua3
3 files changed, 3 insertions, 6 deletions
diff --git a/xmake/modules/private/platform/check_arch.lua b/xmake/modules/private/platform/check_arch.lua
index 34983a422..4e67f8ae9 100644
--- a/xmake/modules/private/platform/check_arch.lua
+++ b/xmake/modules/private/platform/check_arch.lua
@@ -32,7 +32,7 @@ function main(config, default)
config.set("arch", default or os.arch())
-- trace
- cprint("checking for the architecture ... ${green}%s", config.get("arch"))
+ cprint("checking for the architecture ... ${color.success}%s", config.get("arch"))
end
end
diff --git a/xmake/modules/private/platform/check_vstudio.lua b/xmake/modules/private/platform/check_vstudio.lua
index 65fde8db1..6f4e8bab8 100644
--- a/xmake/modules/private/platform/check_vstudio.lua
+++ b/xmake/modules/private/platform/check_vstudio.lua
@@ -87,10 +87,10 @@ function main(config)
config.set("vs", vs, {readonly = true, force = true})
-- trace
- print("checking for the Microsoft Visual Studio (%s) version ... %s", config.get("arch"), vs)
+ cprint("checking for the Microsoft Visual Studio (%s) version ... ${color.success}%s", config.get("arch"), vs)
else
-- failed
- print("checking for the Microsoft Visual Studio (%s) version ... no", config.get("arch"))
+ cprint("checking for the Microsoft Visual Studio (%s) version ... ${color.nothing}${text.nothing}", config.get("arch"))
print("please run:")
print(" - xmake config --vs=xxx [--vs_toolset=xxx]")
print("or - xmake global --vs=xxx")
diff --git a/xmake/platforms/windows/config.lua b/xmake/platforms/windows/config.lua
index 2fe5e58b6..be67f7464 100644
--- a/xmake/platforms/windows/config.lua
+++ b/xmake/platforms/windows/config.lua
@@ -30,9 +30,6 @@ import("private.platform.check_toolchain")
-- get toolchains
function _toolchains()
- -- init cross
- local cross = "xcrun -sdk macosx "
-
-- init toolchains
local cc = toolchain("the c compiler")
local cxx = toolchain("the c++ compiler")