diff options
| author | sfan5 <sfan5@live.de> | 2020-06-30 19:40:22 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2020-07-01 00:44:40 +0300 |
| commit | 8fbc4b1737d5817709e23b06cb83707cd6a34f76 (patch) | |
| tree | 37b7df50dca6ea9bf1730f24e87848afc830833b /.travis.yml | |
| parent | ace249acc5e2576dae42725d10c0351029de1c40 (diff) | |
| download | mpv-8fbc4b1737d5817709e23b06cb83707cd6a34f76.tar.bz2 mpv-8fbc4b1737d5817709e23b06cb83707cd6a34f76.tar.xz | |
ci: add d3d11 to mingw build
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index a711b93775..11393e7d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,11 @@ _macbase: env: - HOMEBREW_NO_AUTO_UPDATE=1 - HOMEBREW_NO_INSTALL_CLEANUP=1 + before_cache: + - brew cleanup -s + cache: + directories: + - $HOME/Library/Caches/Homebrew - &macNew <<: *macOld addons: @@ -22,7 +27,11 @@ _mingwbase: addons: apt: packages: ['autoconf', 'automake', 'pkg-config', 'gcc-mingw-w64', - 'nasm', 'yasm'] + 'gcc-multilib', 'nasm', 'yasm'] + before_install: | + # upgrade MinGW CRT to the one from Ubuntu 20.04 (required for D3D11): + wget "http://archive.ubuntu.com/ubuntu/pool/universe/m/mingw-w64/"mingw-w64-{common,i686-dev,x86-64-dev}_7.0.0-2_all.deb + sudo apt-get install -y ./mingw-w64-*.deb cache: directories: - mingw_prefix/ @@ -131,12 +140,7 @@ before_install: fi fi -before_cache: - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew cleanup -s ; fi -cache: - directories: - - $HOME/Library/Caches/Homebrew script: - ./bootstrap.py |