From b8ed3b0059758a9f0dfd87ef4dd1430e1ac0dca4 Mon Sep 17 00:00:00 2001 From: corristo Date: Tue, 10 Nov 2020 08:21:46 +0000 Subject: [PATCH] [macOS, CI] Update dependencies, don't use lz4 from Homebrew Also, enable double precision support for Bullet. --- CI/before_install.osx.sh | 5 +---- CI/before_script.osx.sh | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index fd77e06936..85434fa06d 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -5,8 +5,5 @@ 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 -brew link --overwrite lz4 # overwrite system lz4; use brew -brew reinstall lz4 - -curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip +curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-f8918dd.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 e11ef1b58b..8f9be16e1a 100755 --- a/CI/before_script.osx.sh +++ b/CI/before_script.osx.sh @@ -25,5 +25,6 @@ cmake \ -D BUILD_BSATOOL=TRUE \ -D BUILD_ESSIMPORTER=TRUE \ -D BUILD_NIFTEST=TRUE \ +-D BULLET_USE_DOUBLES=TRUE \ -G"Unix Makefiles" \ ..