From 8fbc4b1737d5817709e23b06cb83707cd6a34f76 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 30 Jun 2020 19:40:22 +0200
Subject: ci: add d3d11 to mingw build

---
 .travis.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to '.travis.yml')

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
-- 
cgit v1.2.3