diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index d962e76086..ec4ece6343 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,11 +1,15 @@ #!/bin/sh -ex +export HOMEBREW_NO_EMOJI=1 +brew update --quiet + # 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}" ] && 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 +[ -z "${TRAVIS}" ] && brew install fontconfig command -v ccache >/dev/null 2>&1 || brew install ccache command -v cmake >/dev/null 2>&1 || brew install cmake command -v qmake >/dev/null 2>&1 || brew install qt@5 @@ -15,10 +19,6 @@ ccache --version cmake --version qmake --version -brew install lua - -curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210617.zip -o ~/openmw-deps.zip +curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20210716.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null -# additional libraries -[ -z "${TRAVIS}" ] && HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index 27667c1c82..265e05b8ee 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -25,6 +25,5 @@ cmake \ -D BUILD_BSATOOL=TRUE \ -D BUILD_ESSIMPORTER=TRUE \ -D BUILD_NIFTEST=TRUE \ --D USE_LUAJIT=FALSE \ -G"Unix Makefiles" \ .. diff --git a/CMakeLists.txt b/CMakeLists.txt index f81af9e38b..b69cb5b71f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -678,7 +678,7 @@ if (WIN32) if (BUILD_OPENMW) # \bigobj is required: # 1) for OPENMW_UNITY_BUILD; - # 2) to compile lua binginds, because sol3 is heavily templated. + # 2) to compile lua bindings, because sol3 is heavily templated. set_target_properties(openmw PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD} /bigobj") endif()