summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-10-29 00:16:16 +0800
committerruki <[email protected]>2020-10-29 00:16:16 +0800
commitf181def21a641c64962520745dd69d31c14d8f8f (patch)
tree0aca3e50d583c3691b72f161a8fd396f5022dc69
parent83104b07b4511c5f592173cfd4a261a5d2373146 (diff)
improve readme
-rw-r--r--CHANGELOG.md4
-rw-r--r--README.md18
-rw-r--r--README_zh.md18
-rw-r--r--xmake/toolchains/musl/xmake.lua2
4 files changed, 41 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d309306db..5144ef2d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
### New features
* Add new [xrepo](https://github.com/xmake-io/xrepo) command to manage C/C++ packages
+* Support for installing packages of cross-compilation
+* Add musl.cc toolchains
### Change
@@ -855,6 +857,8 @@
### 新特性
* 添加新的 [xrepo](https://github.com/xmake-io/xrepo) 命令去管理安装 C/C++ 包
+* 支持安装交叉编译的依赖包
+* 新增musl.cc上的工具链支持
### 改进
diff --git a/README.md b/README.md
index a55b28066..0f3646f4a 100644
--- a/README.md
+++ b/README.md
@@ -200,6 +200,7 @@ tinyc Tiny C Compiler
emcc A toolchain for compiling to asm.js and WebAssembly
icc Intel C/C++ Compiler
ifort Intel Fortran Compiler
+musl The musl-based cross-compilation toolchains
```
## Supported Languages
@@ -216,6 +217,23 @@ ifort Intel Fortran Compiler
* Cuda
* Zig (Experimental)
+## Support Features
+
+* Simple project configuration syntax
+* Direct build support, without relying on any third-party back-end make tools
+* Support cross platform
+* Support cross compilation
+* Multi-task parallel compilation support
+* C++20 Module-TS support
+* Support cross-platform C/C++ dependency packages
+* Support self-built distributed and third-party package repositories
+* Support multi-language mixed compilation
+* Flexible lua scripts, rich extension modules
+* Support for generating vsproj/cmake/makefile/compile_commands files
+* REPL interactive execution support
+* Incremental compilation support, automatic analysis of header dependency files
+* Fast switching toolchains
+
## Supported Projects
* Static Library
diff --git a/README_zh.md b/README_zh.md
index ff9244f7d..bcaae0fe3 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -209,6 +209,7 @@ tinyc Tiny C Compiler
emcc A toolchain for compiling to asm.js and WebAssembly
icc Intel C/C++ Compiler
ifort Intel Fortran Compiler
+musl The musl-based cross-compilation toolchains
```
## 支持语言
@@ -224,6 +225,23 @@ ifort Intel Fortran Compiler
* Cuda
* Zig (Experimental)
+## 支持特性
+
+* 简洁的配置语法
+* 直接构建支持,不依赖任何第三方后端 make 工具
+* 跨平台支持,不同平台可方便快速地切换
+* 交叉编译支持,智能分析交叉工具链信息
+* 多任务并行编译支持
+* C++20 Module-TS 支持
+* 支持跨平台的 C/C++ 依赖包快速集成
+* 自建分布式包仓库,第三方包仓库支持
+* 多语言混合编译支持
+* 灵活的 lua 脚本,丰富的扩展模块,可实现高度定制化
+* 丰富的插件支持,内置 vs/cmake/makefile/compile_commands 等生成插件
+* REPL 交互式执行支持
+* 增量编译支持,头文件依赖自动分析
+* 工具链的快速切换、定制化支持
+
## 工程类型
* 静态库程序
diff --git a/xmake/toolchains/musl/xmake.lua b/xmake/toolchains/musl/xmake.lua
index f2b2a2d30..a8ddfdc90 100644
--- a/xmake/toolchains/musl/xmake.lua
+++ b/xmake/toolchains/musl/xmake.lua
@@ -23,7 +23,7 @@ toolchain("musl")
-- set homepage
set_homepage("https://musl.cc/")
- set_description("Static cross- and native- musl-based toolchains")
+ set_description("The musl-based cross-compilation toolchains")
-- mark as standalone toolchain
set_kind("standalone")