Skip to content

Commit

Permalink
Update macOS dependencies, use Xcode 10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolaykasyanov committed Dec 20, 2018
1 parent 0f9f7f0 commit e0161bb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ addons:
build_command: "make VERBOSE=1 -j3"
matrix:
include:
- name: OpenMW (all) on MacOS xcode9.4
- name: OpenMW (all) on macOS Xcode 10.1
os: osx
osx_image: xcode9.4
osx_image: xcode10.1
if: branch != coverity_scan
- name: OpenMW (all) on Ubuntu Xenial GCC-5
os: linux
Expand Down
2 changes: 1 addition & 1 deletion CI/before_install.osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ brew outdated cmake || brew upgrade cmake
brew outdated pkgconfig || brew upgrade pkgconfig
brew install qt

curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-7cf2789.zip -o ~/openmw-deps.zip
curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-55c27b1.zip -o ~/openmw-deps.zip
unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null
2 changes: 1 addition & 1 deletion CI/before_script.osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd build
cmake \
-D CMAKE_PREFIX_PATH="$DEPENDENCIES_ROOT;$QT_PATH" \
-D CMAKE_OSX_DEPLOYMENT_TARGET="10.9" \
-D CMAKE_OSX_SYSROOT="macosx10.13" \
-D CMAKE_OSX_SYSROOT="macosx10.14" \
-D CMAKE_BUILD_TYPE=Release \
-D OPENMW_OSX_DEPLOYMENT=TRUE \
-D DESIRED_QT_VERSION=5 \
Expand Down

0 comments on commit e0161bb

Please sign in to comment.