Merge branch 'master' into dev

This commit is contained in:
DRC
2019-12-05 22:38:05 -06:00
2 changed files with 5 additions and 15 deletions

View File

@@ -60,23 +60,16 @@ matrix:
CMAKE_FLAGS="-DWITH_SIMD=0"
CTEST_OUTPUT_ON_FAILURE=1
addons:
homebrew:
brewfile: true
update: true
cache:
directories:
- $HOME/Library/Caches/Homebrew
before_cache:
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
before_install:
- if [ "$BUILD_X32" = "1" ]; then
sudo apt -y --install-recommends install libc6-dev-x32;
fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
pushd $HOME/Downloads &&
curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci &&
. ./macports-ci install &&
sudo /opt/local/bin/port -N install gcc6 yasm md5sha1sum &&
popd &&
git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
ln -fs /Applications/Xcode.app /Applications/Xcode83.app;
fi

View File

@@ -1,3 +0,0 @@
brew 'yasm'
brew 'gcc@6'
brew 'md5sha1sum'