From e126a59290cf409e064fe970b62ed2aec125c25f Mon Sep 17 00:00:00 2001 From: star9029 Date: Fri, 15 Nov 2024 20:59:01 +0800 Subject: support msvc-wine --- xmake/modules/detect/sdks/find_vstudio.lua | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'xmake/modules/detect') diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 1c4e905c8..b65f5e660 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -189,12 +189,16 @@ function find_build_tools(opt) VSCMD_ARG_HOST_ARCH = "x64", } + local buidl_tools_bin = {} local host_dir = "Host" .. vcvars.VSCMD_ARG_HOST_ARCH - local buidl_tools_bin = { - path.join(vcvars.VCToolsInstallDir, "bin", host_dir, target_arch), - path.join(vcvars.WindowsSDKDir, "bin", WindowsSDKVersion), - path.join(vcvars.WindowsSDKDir, "bin", WindowsSDKVersion, "ucrt"), - } + if is_host("windows") then + table.insert(buidl_tools_bin, path.join(vcvars.VCToolsInstallDir, "bin", host_dir, target_arch)) + table.insert(buidl_tools_bin, path.join(vcvars.WindowsSDKDir, "bin", WindowsSDKVersion)) + table.insert(buidl_tools_bin, path.join(vcvars.WindowsSDKDir, "bin", WindowsSDKVersion, "ucrt")) + elseif is_host("linux") then + -- for msvc-wine + table.insert(buidl_tools_bin, path.join(sdkdir, "bin", target_arch)) + end vcvars.VSCMD_ARG_TGT_ARCH = target_arch vcvars.LIB = path.joinenv(lib) -- cgit v1.3.1