From f0b408a9ae6a72ad4ee8ced642cbdd77dbc1f588 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 25 Dec 2020 22:33:55 +0800 Subject: update changelog --- CHANGELOG.md | 2 ++ xmake/plugins/project/vstudio/impl/vs201x.lua | 3 ++- xmake/plugins/project/vsxmake/getinfo.lua | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb071e098..d6099107f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * [#1135](https://github.com/xmake-io/xmake/issues/1135): Improve multi-toolchain and multi-platforms for targets * [#1153](https://github.com/xmake-io/xmake/issues/1153): Improve llvm toolchain to support sysroot on macOS * [#1071](https://github.com/xmake-io/xmake/issues/1071): Improve to generate vs/vsxmake project to support for remote packages +* Improve vs/vsxmake project plugin to support global `set_arch()` setting ### Bugs fixed @@ -903,6 +904,7 @@ * [#1135](https://github.com/xmake-io/xmake/issues/1135): 针对特定 target 改进多平台多工具链同时配置支持 * [#1153](https://github.com/xmake-io/xmake/issues/1153): 改进 llvm 工具链，针对 macos 上编译增加 isysroot 支持 * [#1071](https://github.com/xmake-io/xmake/issues/1071): 改进 vs/vsxmake 生成插件去支持远程依赖包 +* 改进 vs/vsxmake 工程生成插件去支持全局的 `set_arch()` 设置 ### Bugs 修复 diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index f0a98ac53..53b3dab6c 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -199,7 +199,8 @@ function _make_vsinfo_archs() table.insert(vsinfo_archs, arch:trim()) end else - vsinfo_archs = platform.archs() + -- we use it first if global set_arch("xx") is setted in xmake.lua + vsinfo_archs = project.get("target.arch") or platform.archs() end if not vsinfo_archs or #vsinfo_archs == 0 then vsinfo_archs = { config.arch() } diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index b31f9a729..d6c4a002c 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -241,7 +241,8 @@ function _make_vsinfo_archs() table.insert(vsinfo_archs, arch:trim()) end else - vsinfo_archs = platform.archs() + -- we use it first if global set_arch("xx") is setted in xmake.lua + vsinfo_archs = project.get("target.arch") or platform.archs() end if not vsinfo_archs or #vsinfo_archs == 0 then vsinfo_archs = { config.arch() } -- cgit v1.3.1