mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 12:36:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bump-macos-dependencies' into 'master'

Browse source 
Use prebuilt macOS dependencies with fixed SDL and OSG 3.6

Closes 

See merge request 

(cherry picked from commit 74612b1286330b1e34a9c37528502770496e5bba)

9aaca972 Use prebuilt macOS dependencies with fixed SDL and OSG 3.6
This commit is contained in:
psi29a 2021-05-02 13:54:20 +00:00
parent 471ab431f5
commit aca5d2fc12
1 changed files with 4 additions and 4 deletions

8
CI/before_install.osx.sh
View file

@ -1,9 +1,9 @@
#!/bin/sh -ex
# workaround python issue on travis
[-z "${TRAVIS}"] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true
[-z "${TRAVIS}"] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true
[-z "${TRAVIS}"] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.8 || true
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies python@3.9 || true
[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew uninstall --ignore-dependencies qt@6 || true
# Some of these tools can come from places other than brew, so check before installing
command -v ccache >/dev/null 2>&1 || brew install ccache
@ -15,5 +15,5 @@ ccache --version
cmake --version
qmake --version
curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.zip -o ~/openmw-deps.zip
curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-8f5ef6e.zip -o ~/openmw-deps.zip
unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null