diff options
| author |  Yuri Kunde Schlesner | 2016-09-20 22:26:34 -0700 |
|---|---|---|
| committer |  GitHub | 2016-09-20 22:26:34 -0700 |
| commit | 2500a57f3d1364be4d1baa436680d33414372f2c (patch) | |
| tree | 2bed4adf32734d1784de3f6f187652bbd9f4d73f | |
| parent | Merge pull request #2080 from yuriks/shader-interp-crash (diff) | |
| parent | Travis: Fix OS X build (diff) | |
| download | yuzu-2500a57f3d1364be4d1baa436680d33414372f2c.tar.gz yuzu-2500a57f3d1364be4d1baa436680d33414372f2c.tar.xz yuzu-2500a57f3d1364be4d1baa436680d33414372f2c.zip | |
Merge pull request #2097 from citra-emu/fix-travis
Travis: Fix OS X build
| -rwxr-xr-x | .travis-deps.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index 567a2543d..8538098c1 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh | |||
| @@ -28,7 +28,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | |||
| 28 | fi | 28 | fi |
| 29 | 29 | ||
| 30 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then | 30 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then |
| 31 | brew update > /dev/null # silence the very verbose output | 31 | brew update |
| 32 | brew unlink cmake || true | ||
| 33 | brew install cmake qt5 sdl2 dylibbundler | 32 | brew install cmake qt5 sdl2 dylibbundler |
| 34 | fi | 33 | fi |