StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
ThePhD 2016-02-27 02:44:13 -05:00
commit 95c63565a8
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@ -60,6 +60,7 @@ matrix:
- ninja-build - ninja-build
- libluajit-5.1-dev - libluajit-5.1-dev
# clang
- os: linux - os: linux
env: COMPILER=clang++-3.5 LUA_VERSION=lua52 env: COMPILER=clang++-3.5 LUA_VERSION=lua52
compiler: clang compiler: clang
@ -101,11 +102,25 @@ matrix:
- ninja-build - ninja-build
- libluajit-5.1-dev - libluajit-5.1-dev
- os: osx
osx_image: xcode7
compiler: gcc
env: COMPILER=g++-4.9 LUA_VERSION=lua53
- os: osx - os: osx
osx_image: xcode7 osx_image: xcode7
compiler: gcc compiler: gcc
env: COMPILER=g++-5 LUA_VERSION=lua53 env: COMPILER=g++-5 LUA_VERSION=lua53
- os: osx
osx_image: xcode7
compiler: clang
env: COMPILER=appleclang LUA_VERSION=lua53
allow_failures:
- os: osx
compiler: clang
before_install: before_install:
- source ./install.deps.sh - source ./install.deps.sh