diff options
| author | ruki <[email protected]> | 2017-08-05 23:12:23 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-08-05 23:12:23 +0800 |
| commit | 80d60243e2af2587ebac63b1d3ba42919a263ea9 (patch) | |
| tree | 8c2fee91c5da675f6a1c4e97844a37fcd57c09f3 | |
| parent | 72f68f941f9b6d07f71811fe403a2dc178270af0 (diff) | |
modify core xmake file
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | core/src/demo/xmake.lua | 2 | ||||
| -rw-r--r-- | core/src/xmake/xmake.lua | 3 | ||||
| -rw-r--r-- | scripts/installer.nsi | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a327cf175..4a8ffaf46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ * Improve the option detection (cache and multi-jobs) and increase 70% speed * [#129](https://github.com/tboox/xmake/issues/129): Check link deps and cache the target file * Support `*.asm` source files for vs201x project plugin -* Mark `add_bindings` and `add_rbi7777777ndings` as deprecated +* Mark `add_bindings` and `add_rbindings` as deprecated * Optimize `xmake rebuild` speed on windows * Move `core.project.task` to `core.base.task` * Move `echo` and `app2ipa` plugins to [xmake-plugins](https://github.com/tboox/xmake-plugins) repo. diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua index 9f4fd2f0d..40d089f7f 100644 --- a/core/src/demo/xmake.lua +++ b/core/src/demo/xmake.lua @@ -36,6 +36,6 @@ target("demo") -- add the resource files (it will be enabled after publishing new version) if is_plat("windows") then --- add_files("*.rc") + add_files("*.rc") end diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index c50013e4b..484d94b98 100644 --- a/core/src/xmake/xmake.lua +++ b/core/src/xmake/xmake.lua @@ -11,8 +11,7 @@ target("xmake") add_defines("__tb_prefix__=\"xmake\"") -- set the auto-generated config.h - set_config_h("$(projectdir)/xmake.config.h") - set_config_h_prefix("XM_CONFIG") + set_config_header("$(projectdir)/xmake.config.h", {prefix = "XM_CONFIG"}) -- set the object files directory set_objectdir("$(buildir)/.objs") diff --git a/scripts/installer.nsi b/scripts/installer.nsi index f4dd014b5..a61051630 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -60,7 +60,7 @@ RequestExecutionLevel admin ;--------------------------------
; Version Information
-VIProductVersion "2.1.5.0630"
+VIProductVersion "2.1.5.0805"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: http://www.xmake.io"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"
|