From a8d5da851d1d469587adea086c65d61ae20c50ef Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 5 Jul 2017 12:59:00 +0800 Subject: fix windows envirnoment for global --- xmake/platforms/windows/environment.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmake/platforms/windows/environment.lua b/xmake/platforms/windows/environment.lua index 5281880e0..11c9a6534 100644 --- a/xmake/platforms/windows/environment.lua +++ b/xmake/platforms/windows/environment.lua @@ -35,8 +35,11 @@ function _enter(name) return end + -- get arch + local arch = config.get("arch") or global.get("arch") or "" + -- get vs environment for the current arch - local vsenv = vcvarsall[config.get("arch") or ""] or {} + local vsenv = vcvarsall[arch] or {} -- get the pathes for the vs environment local old = nil -- cgit v1.3.1