summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-02-22 22:39:31 +0800
committerruki <[email protected]>2021-02-22 22:39:31 +0800
commitb6c0282918b7e10dd601c4300e125091e0cf2af0 (patch)
tree483441d972b753d6f4ac1fef9bd38858ed8ebf17
parent3a579c246f983da7a91bc870a8395a6227ac93c7 (diff)
update changelog
-rw-r--r--CHANGELOG.md2
-rw-r--r--xmake/rules/platform/windows/manifest/xmake.lua1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eda1467e3..5458953cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
* [#1181](https://github.com/xmake-io/xmake/issues/1181): Add `utils.platform.gnu2mslib(mslib, gnulib)` module api to convert mingw/xxx.dll.a to msvc xxx.lib
* [#1246](https://github.com/xmake-io/xmake/issues/1246): Improve rules and generators to support commands list
* [#1239](https://github.com/xmake-io/xmake/issues/1239): Add `add_extsources` to improve find external packages
+* [#1241](https://github.com/xmake-io/xmake/issues/1241): Support add .manifest files for windows program
### Change
@@ -941,6 +942,7 @@
* [#1181](https://github.com/xmake-io/xmake/issues/1181): 添加 `utils.platform.gnu2mslib(mslib, gnulib)` 模块接口去转换 mingw/xxx.dll.a 到 msvc xxx.lib
* [#1246](https://github.com/xmake-io/xmake/issues/1246): 改进规则支持新的批处理命令去简化自定义规则实现
* [#1239](https://github.com/xmake-io/xmake/issues/1239): 添加 `add_extsources` 去改进外部包的查找
+* [#1241](https://github.com/xmake-io/xmake/issues/1241): 支持为 windows 程序添加 .manifest 文件参与链接
### 改进
diff --git a/xmake/rules/platform/windows/manifest/xmake.lua b/xmake/rules/platform/windows/manifest/xmake.lua
index 63fb57622..36ddc2a0f 100644
--- a/xmake/rules/platform/windows/manifest/xmake.lua
+++ b/xmake/rules/platform/windows/manifest/xmake.lua
@@ -19,6 +19,7 @@
--
-- add *.manifest for windows
+-- https://github.com/xmake-io/xmake/issues/1241
rule("platform.windows.manifest")
set_extensions(".manifest")
before_build_file("windows", function (target, sourcefile)