diff options
| author | ruki <[email protected]> | 2024-07-08 23:00:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-07-08 23:00:31 +0800 |
| commit | b42d338164895297339e94792faf2da4418f1e88 (patch) | |
| tree | c5358dbba82fa954708d6fb28bac5df363e9bd2c | |
| parent | 6161154cd0ee1552f4a369d5da80c82c2fde9407 (diff) | |
enable arm64ec for tools.cmake
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 14 | ||||
| -rw-r--r-- | xmake/platforms/windows/xmake.lua | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 248368e77..735d2fe48 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -100,10 +100,11 @@ end -- get vs arch function _get_vsarch(package) local arch = package:arch() - if arch == 'x86' or arch == 'i386' then return "Win32" end - if arch == 'x86_64' then return "x64" end - if arch:startswith('arm64') then return "ARM64" end - if arch:startswith('arm') then return "ARM" end + if arch == "x86" or arch == "i386" then return "Win32" end + if arch == "x86_64" then return "x64" end + if arch:startswith("arm64") then return "ARM64" end + if arch:startswith("arm64ec") then return "ARM64EC" end + if arch:startswith("arm") then return "ARM" end return arch end @@ -297,7 +298,8 @@ function _get_cmake_system_processor(package) x64 = "AMD64", x86_64 = "AMD64", arm = "ARM", - arm64 = "ARM64" + arm64 = "ARM64", + arm64ec = "ARM64EC" } return archs[package:arch()] or package:arch() end @@ -356,6 +358,8 @@ function _get_configs_for_windows(package, configs, opt) table.insert(configs, "Win32") elseif package:is_arch("arm64") then table.insert(configs, "ARM64") + elseif package:is_arch("arm64ec") then + table.insert(configs, "ARM64EC") elseif package:is_arch("arm.*") then table.insert(configs, "ARM") else diff --git a/xmake/platforms/windows/xmake.lua b/xmake/platforms/windows/xmake.lua index f5f6ca424..2b1bf4014 100644 --- a/xmake/platforms/windows/xmake.lua +++ b/xmake/platforms/windows/xmake.lua @@ -21,7 +21,7 @@ platform("windows") set_os("windows") set_hosts("windows") - set_archs("x86", "x64", "arm", "arm64") + set_archs("x86", "x64", "arm", "arm64", "arm64ec") set_formats("static", "$(name).lib") set_formats("object", "$(name).obj") |