Skip to content

Commit

Permalink
update version
Browse files Browse the repository at this point in the history
  • Loading branch information
waruqi committed Jan 21, 2021
1 parent 6e5fb77 commit 8c42b2c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 22 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@

## master (unreleased)

## v1.6.6

### New features

* Support *BSD system, e.g. FreeBSD ..

### Changes

* Support to change the current directory for process
* Support stdin for creating process
* Fix some compilation errors for mingw

## v1.6.5

Expand Down Expand Up @@ -206,13 +210,17 @@

## master (开发中)

## v1.6.6

### 新特性

* 支持*BSD系统,例如:FreeBSD

### 改进

* 创建进程支持修改处理当前工作目录
* 创建禁止支持 stdin 重定向输入
* 修复一些 mingw 上的编译错误

## v1.6.5

Expand Down
28 changes: 6 additions & 22 deletions xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
set_project("tbox")

-- set xmake minimum version
set_xmakever("2.3.2")
set_xmakever("2.5.1")

-- set project version
set_version("1.6.5", {build = "%Y%m%d%H%M"})
set_version("1.6.6", {build = "%Y%m%d%H%M"})

-- set warning all as error
set_warnings("all", "error")
Expand Down Expand Up @@ -49,30 +49,14 @@ end

-- for the windows platform (msvc)
if is_plat("windows") then

-- add some defines only for windows
add_defines("NOCRYPT", "NOGDI")

-- the release mode
if is_mode("release") then

-- link libcmt.lib
add_cxflags("-MT")

-- the debug mode
elseif is_mode("debug") then

-- enable some checkers
if is_mode("debug") then
add_cxflags("-Gs", "-RTC1")

-- link libcmtd.lib
add_cxflags("-MTd")
set_runtimes("MTd")
else
set_runtimes("MT")
end

-- no msvcrt.lib
add_ldflags("-nodefaultlib:msvcrt.lib")
add_syslinks("ws2_32")

elseif is_plat("android") then
add_syslinks("m", "c")
elseif is_plat("mingw", "msys", "cygwin") then
Expand Down

0 comments on commit 8c42b2c

Please sign in to comment.