diff options
| author | Lioncash <mathew1800@gmail.com> | 2016-06-17 15:03:30 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2016-06-17 16:48:35 +0200 |
| commit | c283a8509d3edf79a6c8eaf3d709b41d545036b5 (patch) | |
| tree | 7624e68ea1ce2bcab330cfc09e52d7d3ed3c080e | |
| parent | Merge pull request #1898 from archshift/interpreter-split-take2 (diff) | |
| download | yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.tar yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.tar.gz yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.tar.bz2 yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.tar.lz yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.tar.xz yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.tar.zst yuzu-c283a8509d3edf79a6c8eaf3d709b41d545036b5.zip | |
| -rwxr-xr-x | .travis-build.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/.travis-build.sh b/.travis-build.sh index 511df04ac..9e9c59b7d 100755 --- a/.travis-build.sh +++ b/.travis-build.sh @@ -16,7 +16,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH mkdir build && cd build - cmake -DCITRA_FORCE_QT4=ON .. + cmake .. make -j4 ctest -VV -C Release diff --git a/.travis.yml b/.travis.yml index 8d86baece..06c00a162 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,17 @@ -os: - - linux - - osx - language: cpp +matrix: + include: + - os: linux + sudo: true + dist: trusty + - os: osx + sudo: false + env: global: - secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg=" -sudo: false - addons: apt: sources: @@ -17,6 +19,8 @@ addons: packages: - gcc-5 - g++-5 + - qt5-default + - libqt5opengl5-dev - xorg-dev - lib32stdc++6 # For CMake - lftp # To upload builds |