summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-11-26 22:52:37 +0800
committerruki <[email protected]>2018-11-26 22:52:37 +0800
commita2605d999d22be668900091af5daa3a992ea6b26 (patch)
tree16b124704bc8b0feaa8187765694a5288564be3c
parentb01f8aea133afbd401ee93b694f32828cc4a4f0c (diff)
parent167236a17971610a6c0862b873618b8ca30728b9 (diff)
Merge branch 'dev' of github.com:tboox/xmake into dev
-rw-r--r--xmake/modules/detect/sdks/find_vstudio.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua
index 525eb9aad..d42fcfc41 100644
--- a/xmake/modules/detect/sdks/find_vstudio.lua
+++ b/xmake/modules/detect/sdks/find_vstudio.lua
@@ -253,8 +253,8 @@ function main(opt)
if vcvarsall then
-- load vcvarsall
- local vcvarsall_x86 = _load_vcvarsall(vcvarsall, "x86", opt.vcvars_ver)
- local vcvarsall_x64 = _load_vcvarsall(vcvarsall, "x64", opt.vcvars_ver)
+ local vcvarsall_x86 = _load_vcvarsall(vcvarsall, "x86", opt.vcvars_ver, opt.sdkver)
+ local vcvarsall_x64 = _load_vcvarsall(vcvarsall, "x64", opt.vcvars_ver, opt.sdkver)
-- save results
results[vsvers[version]] = {version = version, vcvarsall_bat = vcvarsall, vcvarsall = {x86 = vcvarsall_x86, x64 = vcvarsall_x64}}