diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 87013df1ae..21038187aa 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -14,14 +14,13 @@ brew update --quiet 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 -brew install icu4c -brew install yaml-cpp +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 ccache --version cmake --version qmake --version -curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20220225.zip -o ~/openmw-deps.zip +curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20221010.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null diff --git a/CI/before_script.osx.sh b/CI/before_script.osx.sh index cd293a9cc9..c77614f515 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -22,13 +22,15 @@ cmake \ -D CMAKE_OSX_DEPLOYMENT_TARGET="10.15" \ -D CMAKE_BUILD_TYPE=RELEASE \ -D OPENMW_OSX_DEPLOYMENT=TRUE \ --D OPENMW_USE_SYSTEM_SQLITE3=OFF \ +-D OPENMW_USE_SYSTEM_RECASTNAVIGATION=TRUE \ -D BUILD_OPENMW=TRUE \ -D BUILD_OPENCS=TRUE \ -D BUILD_ESMTOOL=TRUE \ -D BUILD_BSATOOL=TRUE \ -D BUILD_ESSIMPORTER=TRUE \ -D BUILD_NIFTEST=TRUE \ +-D BUILD_NAVMESHTOOL=TRUE \ +-D BUILD_BULLETOBJECTTOOL=TRUE \ -D ICU_ROOT="/usr/local/opt/icu4c" \ -G"Unix Makefiles" \ ..