diff options
| author | ruki <[email protected]> | 2021-09-05 00:21:14 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-09-05 00:21:14 +0800 |
| commit | 06b0a3c599b1cfb681dbbd89b4784190aadd2f8a (patch) | |
| tree | 00c1a099f6f7da419208d6491480c6ac833514ce | |
| parent | 1e4cd9f26fdae27e8253f5b214260830d719953b (diff) | |
update changelog
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | xmake/core/project/policy.lua | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4524d2b69..d83e6378c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * [#1618](https://github.com/xmake-io/xmake/issues/1618): Improve vala to support to generate libraries and bindings * Improve Qt rules to support Qt 4.x * Improve `set_symbols("debug")` to generate pdb file for clang on windows +* [#1638](https://github.com/xmake-io/xmake/issues/1638): Improve to merge static library ## v2.5.7 @@ -1079,6 +1080,7 @@ * [#1618](https://github.com/xmake-io/xmake/issues/1618): 改进 vala 支持构建动态库和静态库程序 * 改进 Qt 规则去支持 Qt 4.x * 改进 `set_symbols("debug")` 支持 clang/windows 生成 pdb 文件 +* [#1638](https://github.com/xmake-io/xmake/issues/1638): 改进合并静态库 ## v2.5.7 diff --git a/xmake/core/project/policy.lua b/xmake/core/project/policy.lua index 418d4d566..8491e6883 100644 --- a/xmake/core/project/policy.lua +++ b/xmake/core/project/policy.lua @@ -44,7 +44,7 @@ function policy.policies() -- we can compile the source files for each target in parallel ["build.across_targets_in_parallel"] = {description = "Enable compile the source files for each target in parallel.", default = true, type = "boolean"}, -- merge archive intead of linking for all dependent targets - ["build.merge_archive"] = {description = "Enable merge archive intead of linking for all dependent targets.", default = false, type = "boolean"}, + ["build.merge_archive"] = {description = "Enable merge archive intead of linking for all dependent targets.", default = false, type = "boolean"}, -- we need enable longpaths when building target or installing package ["platform.longpaths"] = {description = "Enable long paths when building target or installing package on windows.", default = false, type = "boolean"}, -- lock required packages |