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

Merge pull request #91 from OpenMW/master

Browse source 
Add OpenMW commits up to 31 Oct
This commit is contained in:
David Cernat 2016-10-31 12:22:37 +02:00 committed by GitHub
commit 4d72e7ce37
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:
- linux
# - osx
- osx
osx_image: xcode7.2
language: cpp
sudo: required

3
CI/before_install.osx.sh
View file

@ -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

2
CI/before_script.osx.sh
View file

@ -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