mirror of
https://github.com/holub/mame
synced 2025-04-15 21:16:28 +03:00
Update Travis CI build environments
Switch Ubuntu build from gcc-9 to gcc-10 Switch macOS build from Xcode 11.0 (macOS 10.14.6) to Xcode 11.5 (macOS 10.15.4)
This commit is contained in:
parent
2fd4687deb
commit
fb86d3ff43
@ -6,7 +6,7 @@ os:
|
||||
- linux
|
||||
- osx
|
||||
dist: bionic
|
||||
osx_image: xcode11
|
||||
osx_image: xcode11.5
|
||||
matrix:
|
||||
exclude:
|
||||
- os: osx
|
||||
@ -19,7 +19,7 @@ script:
|
||||
- if [ $TRAVIS_OS_NAME == 'linux' ]; then
|
||||
if [ $CC == 'clang' ]; then
|
||||
make -j2 IGNORE_GIT=1 OVERRIDE_CXX="clang++-3.6" OVERRIDE_CC="clang-3.6" TOOLS=1 && ./$MAME -validate;
|
||||
else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-9" OVERRIDE_CXX="g++-9" TOOLS=1 && ./$MAME -validate;
|
||||
else make -j4 IGNORE_GIT=1 OPTIMIZE=0 OVERRIDE_CC="gcc-10" OVERRIDE_CXX="g++-10" TOOLS=1 && ./$MAME -validate;
|
||||
fi
|
||||
elif [ $TRAVIS_OS_NAME == 'osx' ]; then
|
||||
unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 TOOLS=1 && ./$MAME -validate;
|
||||
@ -28,7 +28,7 @@ sudo: required
|
||||
before_install:
|
||||
- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi"
|
||||
- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get update -qq; fi"
|
||||
- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes gcc-9 g++-9 libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt5-default; fi"
|
||||
- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes gcc-10 g++-10 libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt5-default; fi"
|
||||
- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew update; fi"
|
||||
- "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install sdl2 sdl2_ttf; fi"
|
||||
branches:
|
||||
|
Loading…
Reference in New Issue
Block a user