teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1117 from nikolaykasyanov/fix-osx-ci

Browse source 
Fix & reenable OS X CI
This commit is contained in:
scrawl 2016-10-30 23:27:57 +01:00 committed by GitHub
commit d073999340
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -1,6 +1,6 @@
os: os:
- linux - linux
# - osx - osx
osx_image: xcode7.2 osx_image: xcode7.2
language: cpp language: cpp
sudo: required sudo: required

3
CI/before_install.osx.sh
View file

@ -1,10 +1,11 @@
#!/bin/sh #!/bin/sh
brew update brew update
brew rm cmake || true brew rm cmake || true
brew rm pkgconfig || true brew rm pkgconfig || true
brew rm qt5 || 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 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 unzip ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null

2
CI/before_script.osx.sh
View file

@ -4,7 +4,7 @@ export CXX=clang++
export CC=clang export CC=clang
DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps" DEPENDENCIES_ROOT="/private/tmp/openmw-deps/openmw-deps"
QT_PATH="/usr/local/opt/qt5" QT_PATH="/usr/local/opt/qt55"
mkdir build mkdir build
cd build cd build