diff options
| author | ruki <[email protected]> | 2017-08-16 16:02:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-08-16 16:02:36 +0800 |
| commit | 728a2d77fbfc62753719c6e8cd9a2438b8bab151 (patch) | |
| tree | f42292528da2555786679140fa6ef4218238114b | |
| parent | 19a8933bcbbd3513916ad3d0ec67ebf1bb8b88ec (diff) | |
modify changelog
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | xmake/actions/require/action/install.lua | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 90be6b2f7..51aa26300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,13 @@ * Inherit links and linkdirs from the dependent targets and options * Improve `target.add_deps` and add inherit config, .e.g `add_deps("test", {inherit = false})` * Remove the binary files of `tbox.pkg` +* Use `/Zi` instead of `/ZI` for msvc ### Bugs fixed * Fix target deps * Fix `target:add` and `option:add` bug +* Fix compilation and installation bug on archlinux ## v2.1.5 @@ -339,12 +341,14 @@ * 改进`add_files`，支持对files粒度进行编译选项的各种配置，更加灵活。 * 从依赖的target和option中继承links和linkdirs。 * 改进`target.add_deps`接口，添加继承配置，允许手动禁止依赖继承，例如：`add_deps("test", {inherit = false})` -* 移除`tbox.pkg`二进制依赖 +* 移除`tbox.pkg`二进制依赖，直接集成tbox源码进行编译 ### Bugs修复 * 修复目标级联依赖问题 * 修复`target:add`和`option:add`问题 +* 修复在archlinux上的编译和安装问题 +* 修复`/ZI`的兼容性问题，用`/Zi`替代 ## v2.1.5 diff --git a/xmake/actions/require/action/install.lua b/xmake/actions/require/action/install.lua index a5a3292cc..2db3f01b8 100644 --- a/xmake/actions/require/action/install.lua +++ b/xmake/actions/require/action/install.lua @@ -100,7 +100,7 @@ option("%s") set_description("The %s package") -- add defines to config.h if checking ok - add_defines_h_if_ok("$(prefix)_PACKAGE_HAVE_%s") + add_defines_h("$(prefix)_PACKAGE_HAVE_%s") -- add links for checking add_links("%s") |