diff --git a/.travis.yml b/.travis.yml index 4f811ee0f..574fe1ba8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ os: - linux -# - osx + - osx osx_image: xcode7.2 language: cpp sudo: required diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index b9da52193..8a306186e 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,10 +1,11 @@ #!/bin/sh brew update + brew rm cmake || true brew rm pkgconfig || true brew rm qt5 || true -brew install cmake pkgconfig qt5 +brew install cmake pkgconfig qt55 curl http://downloads.openmw.org/osx/dependencies/openmw-deps-263d4a8.zip -o ~/openmw-deps.zip unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index c3822291d..32bdd41ae 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -4,7 +4,7 @@ export CXX=clang++ export CC=clang DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" -QT_PATH="/usr/local/opt/qt5" +QT_PATH="/usr/local/opt/qt55" mkdir build cd build