Merge branch 'master' into jgrpp

# Conflicts: # src/newgrf_config.cpp
2021-02-19 20:34:14 +00:00
parent e95216b59d 5fc983a1bb
commit 68a0a4d1b9
7 changed files with 50 additions and 39 deletions
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -66,10 +66,15 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - compiler: clang
-            cxxcompiler: clang++
-          - compiler: gcc
-            cxxcompiler: g++
+        - compiler: clang
+          cxxcompiler: clang++
+          libsdl: libsdl2-dev
+        - compiler: gcc
+          cxxcompiler: g++
+          libsdl: libsdl2-dev
+        - compiler: gcc
+          cxxcompiler: g++
+          libsdl: libsdl1.2-dev

    runs-on: ubuntu-20.04
    env:
@@ -93,7 +98,7 @@ jobs:
          libicu-dev \
          liblzma-dev \
          liblzo2-dev \
-          libsdl2-dev \
+          ${{ matrix.libsdl }} \
          zlib1g-dev \
          # EOF
        echo "::endgroup::"