Merge remote-tracking branch 'remotes/jgallagher/master' into vtab

This commit is contained in:
gwenn
2018-01-20 12:29:07 +01:00
20 changed files with 194 additions and 93 deletions

View File

@@ -1,9 +1,10 @@
environment:
matrix:
- TARGET: 1.15.0-x86_64-pc-windows-gnu
- TARGET: 1.21.0-x86_64-pc-windows-gnu
MSYS2_BITS: 64
- TARGET: 1.15.0-x86_64-pc-windows-msvc
- TARGET: 1.21.0-x86_64-pc-windows-msvc
VCPKG_DEFAULT_TRIPLET: x64-windows
VCPKGRS_DYNAMIC: 1
- TARGET: nightly-x86_64-pc-windows-msvc
VCPKG_DEFAULT_TRIPLET: x64-windows-static
RUSTFLAGS: -Ctarget-feature=+crt-static