Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add xmake.sh #201

Merged
merged 41 commits into from
Dec 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c16c82f
add xmake.sh
waruqi Dec 8, 2022
dfbb02d
add xmake.sh stub
waruqi Dec 8, 2022
7a98d43
improve xmake.sh
waruqi Dec 8, 2022
1f7cbef
update xmake.sh
waruqi Dec 9, 2022
4fe7bb2
check module cfuncs
waruqi Dec 9, 2022
7eb5333
improve to check cfuncs
waruqi Dec 9, 2022
d089957
public test_
waruqi Dec 9, 2022
c1ee7e5
add more files
waruqi Dec 9, 2022
62d85c9
improve flags
waruqi Dec 9, 2022
75dafac
update files
waruqi Dec 9, 2022
b947977
fix file
waruqi Dec 9, 2022
0ff175d
improve demo
waruqi Dec 9, 2022
a46297f
fix xmake.sh
waruqi Dec 9, 2022
46dfa98
improve files
waruqi Dec 9, 2022
76cef3d
update configure
waruqi Dec 10, 2022
cbc9c14
improve configure
waruqi Dec 11, 2022
9b4c52c
improve configure
waruqi Dec 12, 2022
84a2214
fix configure option
waruqi Dec 12, 2022
6e41492
improve configfile
waruqi Dec 12, 2022
6adad8a
improve configure
waruqi Dec 13, 2022
683c506
improve configure
waruqi Dec 13, 2022
68571c4
improve path in configure
waruqi Dec 13, 2022
7e4e35c
improve path apis
waruqi Dec 13, 2022
f07e8a4
remove some toupper
waruqi Dec 13, 2022
e4b2c03
improve string split for configure
waruqi Dec 13, 2022
2541107
improve path dir
waruqi Dec 13, 2022
0ced536
improve path filename
waruqi Dec 13, 2022
cfddaba
improve configure --help
waruqi Dec 13, 2022
bc41788
improve xmake.sh
waruqi Dec 13, 2022
74f5f77
fix xmake.sh
waruqi Dec 13, 2022
20ce77b
improve to check snippets
waruqi Dec 13, 2022
bffae52
improve modules
waruqi Dec 13, 2022
72f970e
add build mode for xmake.sh
waruqi Dec 13, 2022
833d5ab
remove unused count
waruqi Dec 13, 2022
75834c6
fix check snippets
waruqi Dec 13, 2022
b8f7919
fix check snippets again
waruqi Dec 13, 2022
623bac9
improve contains
waruqi Dec 13, 2022
73af390
improve tips
waruqi Dec 13, 2022
ae90143
update changelog
waruqi Dec 13, 2022
e833aa6
update readme
waruqi Dec 13, 2022
1b9922e
add files for mingw
waruqi Dec 13, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ Doxyfile
.vscode
.idea
CMakeLists.txt
Makefile
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## master (unreleased)

### New features

* [#201](https://github.com/tboox/tbox/pull/201): Add xmake.sh

### Changes

* Improve path for windows, support UNC and dos device path
Expand Down Expand Up @@ -268,6 +272,10 @@

## master (开发中)

### 新特性

* [#201](https://github.com/tboox/tbox/pull/201): 添加 xmake.sh

### 改进

* 改进 windows 下根路径处理,支持 UNC 和 dos 设备路径格式
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Some projects using tbox:
* [itrace](https://github.com/tboox/itrace)
* [more](https://github.com/tboox/tbox/wiki/tbox-projects)

## Build
## Build (xmake)

Please install xmake first: [xmake](https://github.com/xmake-io/xmake)

Expand Down Expand Up @@ -227,6 +227,13 @@ $ xmake f -p linux --sdk=/home/sdk # --bin=/home/sdk/bin
$ xmake
```

## Build (xmake.sh)

```console
$ ./configure
$ make
```

## Example

```c
Expand Down
9 changes: 8 additions & 1 deletion README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ TBOX是一个用c语言实现的跨平台开发库。
* [itrace](https://github.com/tboox/itrace)
* [更多项目](https://github.com/tboox/tbox/wiki/%E4%BD%BF%E7%94%A8tbox%E7%9A%84%E5%BC%80%E6%BA%90%E5%BA%93)

## 编译
## 使用 Xmake 编译

请先安装: [xmake](https://github.com/xmake-io/xmake)

Expand Down Expand Up @@ -234,6 +234,13 @@ $ xmake f -p linux --sdk=/home/sdk #--bin=/home/sdk/bin
$ xmake
```

## 使用 xmake.sh 编译

```console
$ ./configure
$ make
```

## 例子

```c
Expand Down
Loading