diff options
| author | ruki <[email protected]> | 2020-12-14 22:39:29 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-12-14 22:39:29 +0800 |
| commit | 4030bf655cd5bbf3af26b682078f4354eb2cb86c (patch) | |
| tree | 5e860e3c4abd5769489de9d6dcae6d514d29e03c /xmake/plugins/project/vstudio/impl/vs201x.lua | |
| parent | 007b2200be5b2a8e5d784829782b56793e93e572 (diff) | |
remove __vcvarsall
Diffstat (limited to 'xmake/plugins/project/vstudio/impl/vs201x.lua')
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index b19ebadc6..f29f77124 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -25,6 +25,7 @@ import("core.project.project") import("core.platform.platform") import("core.tool.compiler") import("core.tool.linker") +import("core.tool.toolchain") import("vs201x_solution") import("vs201x_vcxproj") import("vs201x_vcxproj_filters") @@ -37,9 +38,12 @@ function _make_targetinfo(mode, arch, target) local targetinfo = { mode = mode, arch = (arch == "x86" and "Win32" or "x64") } -- get sdk version - local vcvarsall = config.get("__vcvarsall") - if vcvarsall then - targetinfo.sdkver = (vcvarsall[arch] or {}).WindowsSDKVersion + local msvc = toolchain.load("msvc") + if msvc then + local vcvars = msvc:config("vcvars") + if vcvars then + targetinfo.sdkver = vcvars.WindowsSDKVersion + end end -- save c/c++ precompiled output file (.pch) |
