summaryrefslogtreecommitdiff
path: root/xmake/modules/detect
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-08 22:59:07 +0800
committerruki <[email protected]>2024-07-08 22:59:07 +0800
commit6161154cd0ee1552f4a369d5da80c82c2fde9407 (patch)
tree684c3d1419236a48e94e095dabe9c8a868200237 /xmake/modules/detect
parent8621473fcae841844b670173df23646f7e1a40d0 (diff)
support arm64ec
Diffstat (limited to 'xmake/modules/detect')
-rw-r--r--xmake/modules/detect/sdks/find_vstudio.lua24
1 files changed, 14 insertions, 10 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua
index 183f7162f..2ce2b44eb 100644
--- a/xmake/modules/detect/sdks/find_vstudio.lua
+++ b/xmake/modules/detect/sdks/find_vstudio.lua
@@ -266,10 +266,11 @@ function _find_vstudio(opt)
if vcvarsall and os.isfile(vcvarsall) and vsvers[VisualStudioVersion] then
-- load vcvarsall
- local vcvarsall_x86 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x86", opt)
- local vcvarsall_x64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x64", opt)
- local vcvarsall_arm = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm", opt)
- local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm64", opt)
+ local vcvarsall_x86 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x86", opt)
+ local vcvarsall_x64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "x64", opt)
+ local vcvarsall_arm = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm", opt)
+ local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, VisualStudioVersion, "arm64", opt)
+ local vcvarsall_arm64ec = vcvarsall_arm64
-- save results
local results = {}
@@ -280,7 +281,8 @@ function _find_vstudio(opt)
x86 = vcvarsall_x86,
x64 = vcvarsall_x64,
arm = vcvarsall_arm,
- arm64 = vcvarsall_arm64
+ arm64 = vcvarsall_arm64,
+ arm64ec = vcvarsall_arm64ec
}
}
return results
@@ -375,10 +377,11 @@ function _find_vstudio(opt)
if vcvarsall then
-- load vcvarsall
- local vcvarsall_x86 = _load_vcvarsall(vcvarsall, version, "x86", opt)
- local vcvarsall_x64 = _load_vcvarsall(vcvarsall, version, "x64", opt)
- local vcvarsall_arm = _load_vcvarsall(vcvarsall, version, "arm", opt)
- local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, version, "arm64", opt)
+ local vcvarsall_x86 = _load_vcvarsall(vcvarsall, version, "x86", opt)
+ local vcvarsall_x64 = _load_vcvarsall(vcvarsall, version, "x64", opt)
+ local vcvarsall_arm = _load_vcvarsall(vcvarsall, version, "arm", opt)
+ local vcvarsall_arm64 = _load_vcvarsall(vcvarsall, version, "arm64", opt)
+ local vcvarsall_arm64ec = vcvarsall_arm64
-- save results
results[vsvers[version]] = {
@@ -388,7 +391,8 @@ function _find_vstudio(opt)
x86 = vcvarsall_x86,
x64 = vcvarsall_x64,
arm = vcvarsall_arm,
- arm64 = vcvarsall_arm64
+ arm64 = vcvarsall_arm64,
+ arm64ec = vcvarsall_arm64ec
}
}
end