summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--core/project.mak2
-rw-r--r--core/xmake.lua2
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2934c3ec7..c9ddcdf0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## master (unreleased)
+## v2.3.6
+
### New features
* Add `xmake project -k xcode` generator (use cmake)
@@ -786,6 +788,8 @@
## master (开发中)
+## v2.3.6
+
### 新特性
* 添加xcode工程生成器插件,`xmake project -k cmake` (当前采用cmake生成)
diff --git a/core/project.mak b/core/project.mak
index 316073caf..87664e299 100644
--- a/core/project.mak
+++ b/core/project.mak
@@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2
PRO_VERSION_MINOR = 3
# the project alter version
-PRO_VERSION_ALTER = 5
+PRO_VERSION_ALTER = 6
# the project prefix
PRO_PREFIX = XM_
diff --git a/core/xmake.lua b/core/xmake.lua
index 4ce9c637b..ac5922bba 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -2,7 +2,7 @@
set_project("xmake")
-- version
-set_version("2.3.5", {build = "%Y%m%d%H%M"})
+set_version("2.3.6", {build = "%Y%m%d%H%M"})
-- set xmake min version
set_xmakever("2.2.3")