|
@@ -73,26 +73,26 @@ jobs:
|
|
|
fail-fast: false
|
|
|
matrix:
|
|
|
include:
|
|
|
- name: Clang
|
|
|
compiler: clang
|
|
|
cxxcompiler: clang++
|
|
|
libraries: libsdl2-dev
|
|
|
libraries: libsdl2-dev nlohmann-json3-dev
|
|
|
- name: GCC - SDL2
|
|
|
compiler: gcc
|
|
|
cxxcompiler: g++
|
|
|
libraries: libsdl2-dev
|
|
|
libraries: libsdl2-dev nlohmann-json3-dev
|
|
|
- name: GCC - SDL1.2
|
|
|
compiler: gcc
|
|
|
cxxcompiler: g++
|
|
|
libraries: libsdl1.2-dev
|
|
|
libraries: libsdl1.2-dev nlohmann-json3-dev
|
|
|
- name: GCC - Dedicated
|
|
|
compiler: gcc
|
|
|
cxxcompiler: g++
|
|
|
extra-cmake-parameters: -DOPTION_DEDICATED=ON -DCMAKE_CXX_FLAGS_INIT="-DRANDOM_DEBUG" -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
|
|
|
# Compile without SDL / SDL2, as that should compile fine too.
|
|
|
# Compile without SDL / SDL2 / nlohmann-json, as that should compile fine too.
|
|
|
|
|
|
name: Linux (${{ matrix.name }})
|
|
|
|
|
|
runs-on: ubuntu-20.04
|
|
|
env:
|
|
|
CC: ${{ matrix.compiler }}
|
|
@@ -194,23 +194,24 @@ jobs:
|
|
|
echo "image=$ImageOS-$ImageVersion" >> $GITHUB_OUTPUT
|
|
|
|
|
|
- name: Enable vcpkg cache
|
|
|
uses: actions/cache@v3
|
|
|
with:
|
|
|
path: /usr/local/share/vcpkg/installed
|
|
|
key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
|
|
|
key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-1 # Increase the number whenever dependencies are modified
|
|
|
restore-keys: |
|
|
|
${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
|
|
|
|
|
|
- name: Prepare vcpkg
|
|
|
run: |
|
|
|
vcpkg install --triplet=${{ matrix.arch }}-osx \
|
|
|
curl \
|
|
|
liblzma \
|
|
|
libpng \
|
|
|
lzo \
|
|
|
nlohmann-json \
|
|
|
zlib \
|
|
|
# EOF
|
|
|
|
|
|
- name: Install OpenGFX
|
|
|
run: |
|
|
|
mkdir -p ~/Documents/OpenTTD/baseset
|
|
@@ -277,23 +278,24 @@ jobs:
|
|
|
Write-Output "image=$env:ImageOS-$env:ImageVersion" >> $env:GITHUB_OUTPUT
|
|
|
|
|
|
- name: Enable vcpkg cache
|
|
|
uses: actions/cache@v3
|
|
|
with:
|
|
|
path: vcpkg/installed
|
|
|
key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-0 # Increase the number whenever dependencies are modified
|
|
|
key: ${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}-1 # Increase the number whenever dependencies are modified
|
|
|
restore-keys: |
|
|
|
${{ steps.key.outputs.image }}-vcpkg-${{ matrix.arch }}
|
|
|
|
|
|
- name: Prepare vcpkg
|
|
|
shell: bash
|
|
|
run: |
|
|
|
vcpkg install --triplet=${{ matrix.arch }}-windows-static \
|
|
|
liblzma \
|
|
|
libpng \
|
|
|
lzo \
|
|
|
nlohmann-json \
|
|
|
zlib \
|
|
|
# EOF
|
|
|
|
|
|
- name: Install OpenGFX
|
|
|
shell: bash
|
|
|
run: |
|
|
@@ -374,12 +376,13 @@ jobs:
|
|
|
mingw-w64-${{ matrix.arch }}-cmake
|
|
|
mingw-w64-${{ matrix.arch }}-gcc
|
|
|
mingw-w64-${{ matrix.arch }}-lzo2
|
|
|
mingw-w64-${{ matrix.arch }}-libpng
|
|
|
mingw-w64-${{ matrix.arch }}-lld
|
|
|
mingw-w64-${{ matrix.arch }}-ninja
|
|
|
mingw-w64-${{ matrix.arch }}-nlohmann-json
|
|
|
|
|
|
- name: Install OpenGFX
|
|
|
shell: bash
|
|
|
run: |
|
|
|
mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
|
|
|
cd "C:/Users/Public/Documents/OpenTTD/baseset"
|