diff options
author | David Haywood <mamehaze@users.noreply.github.com> | 2015-12-12 19:40:48 +0000 |
---|---|---|
committer | David Haywood <mamehaze@users.noreply.github.com> | 2015-12-12 19:40:48 +0000 |
commit | 1800e366c2288901e9783fc2d00c79722eb3cd0b (patch) | |
tree | c66f0bfda6ea740010060a765cb46d55f6e6689b /.travis.yml | |
parent | 36c95cb960b61348e658f9669a7ca3105654bb66 (diff) | |
parent | 3710d8eca33260a82bed7577451946022d8fad3a (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 3b74a0ca33b..9ddd3185d5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ script: - if [ $TRAVIS_OS_NAME == 'linux' ]; then if [ $CC == 'clang' ]; then make -j2 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" && ./$MAME -validate; - else make -j6 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate; + else make -j3 OPTIMIZE=0 OVERRIDE_CC="gcc-5" OVERRIDE_CXX="g++-5" && ./$MAME -validate; fi elif [ $TRAVIS_OS_NAME == 'osx' ]; then unset LDOPTS && make -j2 OPTIMIZE=0 MACOSX_USE_LIBSDL=1 && ./$MAME -validate; |