summaryrefslogtreecommitdiff
path: root/xmake/toolchains/msvc/load.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-14 21:00:04 +0800
committerruki <[email protected]>2020-12-14 21:00:04 +0800
commit007b2200be5b2a8e5d784829782b56793e93e572 (patch)
tree403978ce861800594e7904f0c609e92613c2a480 /xmake/toolchains/msvc/load.lua
parent361eda0cd491f887acfb842567f498a553249ad7 (diff)
improve find_rc
Diffstat (limited to 'xmake/toolchains/msvc/load.lua')
-rw-r--r--xmake/toolchains/msvc/load.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/xmake/toolchains/msvc/load.lua b/xmake/toolchains/msvc/load.lua
index 95ebe0cf1..b112e2c80 100644
--- a/xmake/toolchains/msvc/load.lua
+++ b/xmake/toolchains/msvc/load.lua
@@ -35,7 +35,7 @@ function _add_vsenv(toolchain, name)
-- get the paths for the vs environment
local new = vcvars[name]
if new then
- toolchain:add("runenvs", name:upper(), path.splitenv(new))
+ toolchain:add("runenvs", name, table.unwrap(path.splitenv(new)))
end
end
@@ -61,6 +61,8 @@ function main(toolchain)
_add_vsenv(toolchain, "LIB")
_add_vsenv(toolchain, "INCLUDE")
_add_vsenv(toolchain, "LIBPATH")
+ _add_vsenv(toolchain, "WindowsSdkDir")
+ _add_vsenv(toolchain, "WindowsSDKVersion")
-- add some default flags
toolchain:add("cxxflags", "/EHsc")