diff options
| author | ruki <[email protected]> | 2020-03-28 22:25:41 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-28 22:25:41 +0800 |
| commit | efad01e547f30d66d90e486c91c3afa0dbaceed3 (patch) | |
| tree | 946f11f60752896c9896c135311893a0b7e2d937 | |
| parent | 33ea9536a16adbec42a738b30821a19fc7076c4a (diff) | |
fix rc output
| -rwxr-xr-x | scripts/archlinux/PKGBUILD | 6 | ||||
| -rw-r--r-- | xmake/modules/core/tools/rc.lua | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/archlinux/PKGBUILD b/scripts/archlinux/PKGBUILD index 3b86c7de1..2d17c0dfe 100755 --- a/scripts/archlinux/PKGBUILD +++ b/scripts/archlinux/PKGBUILD @@ -2,15 +2,15 @@ # PKGBuild Create By: lumpyzhu <[email protected]> pkgname=xmake -pkgver=2.3.1 -pkgrel=9 +pkgver=2.3.2 +pkgrel=1 pkgdesc="A make-like build utility based on Lua" arch=('i686' 'x86_64') url="https://github.com/xmake-io/xmake" license=('Apache') makedepends=() source=("$pkgname.tar.gz::https://github.com/xmake-io/xmake/releases/download/v${pkgver}/xmake-v${pkgver}.tar.gz") -sha256sums=('c927efad5412c3bdb8bad1be5b1b2ea40a998dff2a252edb443782865b7472b9') +sha256sums=('b189074320ce1b215f85f8f20142fe173d981eb17c2c157f0fa6756fc00dac4e') build() { cd "$srcdir" diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua index 13c31bb50..12c94fa5f 100644 --- a/xmake/modules/core/tools/rc.lua +++ b/xmake/modules/core/tools/rc.lua @@ -58,7 +58,8 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags) try { function () - local outdata, errdata = vstool.iorunv(_compargv1(self, sourcefile, objectfile, flags)) + -- @note we need not uses vstool.iorunv to enable unicode output for rc.exe + local outdata, errdata = os.iorunv(_compargv1(self, sourcefile, objectfile, flags)) return (outdata or "") .. (errdata or "") end, catch |