From b7adc419e76eef4604f778b86732469a4e9c0471 Mon Sep 17 00:00:00 2001 From: xq114 <1140735506@qq.com> Date: Sat, 6 Nov 2021 16:11:10 +0800 Subject: update load.lua --- xmake/toolchains/msvc/load.lua | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/xmake/toolchains/msvc/load.lua b/xmake/toolchains/msvc/load.lua index b6b9175f0..f6547fed0 100644 --- a/xmake/toolchains/msvc/load.lua +++ b/xmake/toolchains/msvc/load.lua @@ -60,9 +60,28 @@ function main(toolchain) _add_vsenv(toolchain, "LIB") _add_vsenv(toolchain, "INCLUDE") _add_vsenv(toolchain, "LIBPATH") - -- find_rc.lua need them _add_vsenv(toolchain, "WindowsSdkDir") _add_vsenv(toolchain, "WindowsSDKVersion") + _add_vsenv(toolchain, "WindowsSdkBinPath") + _add_vsenv(toolchain, "WindowsSDKLibVersion") + _add_vsenv(toolchain, "WindowsSdkVerBinPath") + _add_vsenv(toolchain, "DevEnvDir") + _add_vsenv(toolchain, "ExtensionSdkDir") + _add_vsenv(toolchain, "VCIDEInstallDir") + _add_vsenv(toolchain, "VCINSTALLDIR") + _add_vsenv(toolchain, "VCToolsInstallDir") + _add_vsenv(toolchain, "VCToolsRedistDir") + _add_vsenv(toolchain, "VCToolsVersion") + _add_vsenv(toolchain, "VisualStudioVersion") + _add_vsenv(toolchain, "VSINSTALLDIR") + _add_vsenv(toolchain, "VSCMD_VER") + _add_vsenv(toolchain, "VSCMD_ARG_app_plat") + _add_vsenv(toolchain, "VSCMD_ARG_HOST_ARCH") + _add_vsenv(toolchain, "VSCMD_ARG_TGT_ARCH") + _add_vsenv(toolchain, "VS140COMNTOOLS") + _add_vsenv(toolchain, "VS150COMNTOOLS") + _add_vsenv(toolchain, "VS160COMNTOOLS") + _add_vsenv(toolchain, "VS170COMNTOOLS") -- add some default flags toolchain:add("cl.cxxflags", "/EHsc") -- cgit v1.3.1