aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorCameron Cawley2019-06-21 16:05:39 +0100
committerGitHub2019-06-21 16:05:39 +0100
commit027e41632f889095d9071843596697baba3867e9 (patch)
tree5e4e8c9fd08da1148481596daa301d0616de265f /.travis.yml
parent12b5dde457cb69e7e8e7136628889f57f4ecfd04 (diff)
downloadscummvm-rg350-027e41632f889095d9071843596697baba3867e9.tar.gz
scummvm-rg350-027e41632f889095d9071843596697baba3867e9.tar.bz2
scummvm-rg350-027e41632f889095d9071843596697baba3867e9.zip
TRAVIS: Don't build with gcc on Mac OS X (#1692)
* TRAVIS: Don't build with gcc on Mac OS X gcc on Mac OS X is just a frontend for LLVM. * TRAVIS: Fix building with clang on Linux
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml15
1 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 1a47909f06..67b85686b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,13 +51,14 @@ branches:
only:
- master
-compiler:
- - gcc
- - clang
-
-os:
- - linux
- - osx
+matrix:
+ include:
+ - os: linux
+ compiler: gcc
+ - os: linux
+ compiler: clang
+ - os: osx
+ compiler: clang
dist: trusty