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

Merge branch 'macos_gitlab_fix' into 'master'

Browse source 
Clean up before_install.osx.sh for use on gitlab; small fix for jpeg problem

See merge request OpenMW/openmw!2754
This commit is contained in:
psi29a 2023-02-20 10:51:58 +00:00
commit 67f0d37c20
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CI/before_install.osx.sh
View file

@ -1,20 +1,23 @@
#!/bin/sh -ex #!/bin/sh -ex
export HOMEBREW_NO_EMOJI=1 export HOMEBREW_NO_EMOJI=1
brew uninstall --ignore-dependencies python@3.8 || true
brew uninstall --ignore-dependencies python@3.9 || true
brew uninstall --ignore-dependencies qt@6 || true
brew uninstall --ignore-dependencies jpeg || true
brew tap --repair brew tap --repair
brew update --quiet brew update --quiet
# workaround python issue on travis
[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies python@3.8 || true
[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies python@3.9 || true
[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
# Some of these tools can come from places other than brew, so check before installing # Some of these tools can come from places other than brew, so check before installing
[ -z "${TRAVIS}" ] && brew reinstall xquartz brew reinstall xquartz fontconfig
[ -z "${TRAVIS}" ] && brew reinstall fontconfig
command -v ccache >/dev/null 2>&1 || brew install ccache command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake command -v cmake >/dev/null 2>&1 || brew install cmake
command -v qmake >/dev/null 2>&1 || brew install qt@5 command -v qmake >/dev/null 2>&1 || brew install qt@5
# Install deps
brew install icu4c yaml-cpp sqlite brew install icu4c yaml-cpp sqlite
export PATH="/usr/local/opt/qt@5/bin:$PATH" # needed to use qmake in none default path as qt now points to qt6 export PATH="/usr/local/opt/qt@5/bin:$PATH" # needed to use qmake in none default path as qt now points to qt6