Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix WindowsSDKDir -> WindowsSdkDir #5851

Merged
merged 1 commit into from
Nov 21, 2024
Merged

fix WindowsSDKDir -> WindowsSdkDir #5851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions xmake/modules/detect/sdks/find_vstudio.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,22 @@ function find_build_tools(opt)
end
end
variables.WindowsSDKVersion = WindowsSDKVersion
variables.WindowsSDKDir = path.join(sdkdir, "Windows Kits/10")
variables.WindowsSdkDir = path.join(sdkdir, "Windows Kits/10")

local includedirs = {
path.join(variables.VCToolsInstallDir, "include"),
path.join(variables.VCToolsInstallDir, "atlmfc/include"),
path.join(variables.WindowsSDKDir, "Include", WindowsSDKVersion, "ucrt"),
path.join(variables.WindowsSDKDir, "Include", WindowsSDKVersion, "shared"),
path.join(variables.WindowsSDKDir, "Include", WindowsSDKVersion, "um"),
path.join(variables.WindowsSDKDir, "Include", WindowsSDKVersion, "winrt"),
path.join(variables.WindowsSDKDir, "Include", WindowsSDKVersion, "cppwinrt"),
path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "ucrt"),
path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "shared"),
path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "um"),
path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "winrt"),
path.join(variables.WindowsSdkDir, "Include", WindowsSDKVersion, "cppwinrt"),
}

local linkdirs = {
path.join(variables.VCToolsInstallDir, "lib"),
path.join(variables.WindowsSDKDir, "Lib", WindowsSDKVersion, "ucrt"),
path.join(variables.WindowsSDKDir, "Lib", WindowsSDKVersion, "um"),
path.join(variables.WindowsSdkDir, "Lib", WindowsSDKVersion, "ucrt"),
path.join(variables.WindowsSdkDir, "Lib", WindowsSDKVersion, "um"),
}

local archs = {
Expand All @@ -175,7 +175,7 @@ function find_build_tools(opt)
local vcvars = {
BUILD_TOOLS_ROOT = sdkdir,
INCLUDE = path.joinenv(includedirs),
WindowsSDKDir = variables.WindowsSDKDir,
WindowsSdkDir = variables.WindowsSdkDir,
WindowsSDKVersion = WindowsSDKVersion,
VCToolsInstallDir = variables.VCToolsInstallDir,
VSCMD_ARG_HOST_ARCH = "x64",
Expand All @@ -185,8 +185,8 @@ function find_build_tools(opt)
local host_dir = "Host" .. vcvars.VSCMD_ARG_HOST_ARCH
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"))
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))
Expand Down
Loading