diff options
| author | ruki <[email protected]> | 2020-07-14 23:56:13 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-14 23:56:13 +0800 |
| commit | 8116401dd0831293b0dbb8822d550fa9e27a0755 (patch) | |
| tree | 1484c7fbc12395d4a6321d788a383a6d92ecf9e9 | |
| parent | ae2a52115fa338dee9fbd426771b34dabe882d76 (diff) | |
| parent | a4dd918dafdbddf5a508e033b07a4d1d5eb059f5 (diff) | |
Merge pull request #892 from OpportunityLiu/dev
fix #890
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 1cd51035b..78aa483db 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -58,6 +58,14 @@ function _escape(str) return (string.gsub(str, "[%%%$@';%?%*\"<>&]", function (c) return assert(map[c]) end)) end +function _vs_arch(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 + return arch +end + function _make_dirs(dir) if dir == nil then return "" @@ -116,7 +124,7 @@ function _make_targetinfo(mode, arch, target) mode = mode , arch = arch , plat = config.get("plat") - , vsarch = (arch == "x86" and "Win32" or arch) + , vsarch = _vs_arch(arch) , sdkver = config.get("vs_sdkver") } |