diff options
| author | mclee <[email protected]> | 2018-11-26 18:59:21 +0800 |
|---|---|---|
| committer | mclee <[email protected]> | 2018-11-26 18:59:21 +0800 |
| commit | 7d0901f3014960bd53afa0918f21c4a53094faad (patch) | |
| tree | b70299eb53179d7b98c7334894bc9485eac0d963 | |
| parent | 6c56467b2938a414f62311133fe8a0edb3aaa5c6 (diff) | |
Fixes a issues that failed to run vcvarsall when vs_toolset and vs_sdkver are setted at same time.
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 4 |
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}} |