From 3bbc5074add71d4f5d864f6cfe02abb6646ac4ac Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 13 Jan 2021 23:07:49 +0800 Subject: improve find_vstudio --- core/src/tbox/tbox | 2 +- xmake/modules/detect/sdks/find_vstudio.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox index b65c07068..6e5fb77c5 160000 --- a/core/src/tbox/tbox +++ b/core/src/tbox/tbox @@ -1 +1 @@ -Subproject commit b65c07068e36eec351de7efac2a69332f3c67386 +Subproject commit 6e5fb77c5ab5c0d712871c52c42a5bc7843cd780 diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index f833f304d..d908bcc5a 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -45,6 +45,9 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt) local genvcvars_bat = os.tmpfile() .. "_genvcvars.bat" local file = io.open(genvcvars_bat, "w") file:print("@echo off") + -- @note we need get utf8 output from cmd.exe + -- because some %PATH% and other envs maybe contains unicode characters + file:print("chcp 65001") -- fix error caused by the new vsDevCmd.bat of vs2019 -- @see https://github.com/xmake-io/xmake/issues/549 if vsver and tonumber(vsver) >= 16 then -- cgit v1.3.1