ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

travis: use Mac OS 10.14 and Xcode 10.2.1 

The default Mac OS environment on travis no longer has brew bottle
support, so jobs time out.

Add the `osx_image` key to specify Mac OS 10.14 and Xcode 10.2.1.

Also try to re-enable link support using SFML.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2019-05-29 23:26:46 +00:00
parent b0ec84693e
commit 3490620e0f
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -66,12 +66,13 @@ matrix:
- env: BUILD_ENV=mac - env: BUILD_ENV=mac
language: cpp language: cpp
os: osx os: osx
osx_image: xcode10.2
before_script: before_script:
- ./installdeps - ./installdeps
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON -DENABLE_LINK=OFF - cmake .. -DENABLE_SDL=ON -DENABLE_OPENAL=ON -DENABLE_LINK=ON
- make -j2 - make -j2
- ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help - ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
cache: cache:

4
installdeps
View File

@ -1054,9 +1054,9 @@ brew_installdeps() {
brews="nasm cmake ccache ffmpeg gettext libpng pkg-config sdl2 wxmac ccache" brews="nasm cmake ccache ffmpeg gettext libpng pkg-config sdl2 wxmac ccache"
# sfml brew currently broken in the travis mac environment # sfml brew currently broken in the travis mac environment
if [ -z "$TRAVIS" ]; then # if [ -z "$TRAVIS" ]; then
brews="$brews sfml" brews="$brews sfml"
fi # fi
set -- set --
for f in $brews; do for f in $brews; do