From 44c7fb916575df39153a3e07441d1f42f9d4a68d Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Sun, 22 Dec 2019 04:08:02 +0100 Subject: [PATCH] Update CI to target SDL2 --- .github/workflows/windows.yml | 10 +++++----- scripts/automator/packages/manager-apt | 2 +- scripts/automator/packages/manager-brew | 2 +- scripts/automator/packages/manager-dnf | 2 +- scripts/automator/packages/manager-macports | 2 +- scripts/automator/packages/manager-msys2 | 2 +- scripts/automator/packages/manager-pacman | 4 ++-- scripts/automator/packages/manager-vcpkg | 2 +- scripts/automator/packages/manager-zypper | 5 ++--- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1691ebf0..64017bb2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,7 +42,7 @@ jobs: if: matrix.conf.compiler == 'GCC' with: path: 'C:/tools/msys64' - key: msys2-${{ matrix.conf.compiler }}-${{ matrix.conf.bits }}-${{ steps.get-date.outputs.date }} + key: msys2-${{ matrix.conf.compiler }}-${{ matrix.conf.bits }}-${{ steps.get-date.outputs.date }}-sdl2 - name: Install MSYS2 if: steps.cache-msys2.outputs.cache-hit != 'true' run: choco install msys2 --no-progress @@ -82,7 +82,7 @@ jobs: - name: Install packages shell: pwsh run: | - vcpkg install libpng sdl1 sdl1-net opusfile + vcpkg install libpng sdl2 sdl2-net opusfile vcpkg integrate install - name: Log environment shell: pwsh @@ -103,7 +103,7 @@ jobs: - name: Install packages shell: pwsh run: | - vcpkg install libpng sdl1 sdl1-net opusfile + vcpkg install libpng sdl2 sdl2-net opusfile vcpkg integrate install - name: Log environment shell: pwsh @@ -139,8 +139,8 @@ jobs: cp vs/Release/libpng16.dll dest/ cp vs/Release/ogg.dll dest/ cp vs/Release/opus.dll dest/ - cp vs/Release/SDL.dll dest/ - cp vs/Release/SDL_net.dll dest/ + cp vs/Release/SDL2.dll dest/ + cp vs/Release/SDL2_net.dll dest/ cp src/libs/zmbv/Release/zlib1.dll dest/ cp src/libs/zmbv/Release/zmbv.dll dest/ # Fill README template file diff --git a/scripts/automator/packages/manager-apt b/scripts/automator/packages/manager-apt index 4fa2f760..c0f63623 100644 --- a/scripts/automator/packages/manager-apt +++ b/scripts/automator/packages/manager-apt @@ -1,2 +1,2 @@ # Package repo: https://packages.ubuntu.com/ -packages+=(xvfb libtool build-essential libsdl1.2-dev libsdl-net1.2-dev libncurses-dev libopusfile-dev) +packages+=(xvfb libtool build-essential libsdl2-dev libsdl2-net-dev libncurses-dev libopusfile-dev) diff --git a/scripts/automator/packages/manager-brew b/scripts/automator/packages/manager-brew index 892cab27..45ffb4fd 100644 --- a/scripts/automator/packages/manager-brew +++ b/scripts/automator/packages/manager-brew @@ -1,3 +1,3 @@ # Package repo: https://formulae.brew.sh/ delim="@" -packages+=(coreutils autogen autoconf automake make pkg-config libpng ncurses sdl sdl_net opusfile) +packages+=(coreutils autogen autoconf automake make pkg-config libpng ncurses sdl2 sdl2_net opusfile) diff --git a/scripts/automator/packages/manager-dnf b/scripts/automator/packages/manager-dnf index 79f1d9ab..7c202b6d 100644 --- a/scripts/automator/packages/manager-dnf +++ b/scripts/automator/packages/manager-dnf @@ -1,2 +1,2 @@ # Package repo: https://apps.fedoraproject.org/packages/ -packages+=(xvfb libtool ncurses-devel SDL SDL_net-devel opusfile-devel) +packages+=(xvfb libtool ncurses-devel SDL2-devel SDL2_net-devel opusfile-devel) diff --git a/scripts/automator/packages/manager-macports b/scripts/automator/packages/manager-macports index 826b1496..77657a0c 100644 --- a/scripts/automator/packages/manager-macports +++ b/scripts/automator/packages/manager-macports @@ -1,3 +1,3 @@ # Package repo: https://www.macports.org/ports.php?by=name delim="" -packages+=(coreutils autogen autoconf automake pkgconfig libpng ncurses libsdl libsdl_net opusfile) +packages+=(coreutils autogen autoconf automake pkgconfig libpng ncurses libsdl2 libsdl2_net opusfile) diff --git a/scripts/automator/packages/manager-msys2 b/scripts/automator/packages/manager-msys2 index d67e32ba..1d79c558 100644 --- a/scripts/automator/packages/manager-msys2 +++ b/scripts/automator/packages/manager-msys2 @@ -2,6 +2,6 @@ # MSYS2 only supports the current latest releases of Clang and GCC, so we disable version customization packages+=(autogen autoconf base-devel automake-wrapper binutils) pkg_type=$([[ "${bits}" == "64" ]] && echo "x86_64" || echo "i686") -for pkg in pkg-config libtool libpng zlib ncurses pdcurses SDL SDL_net opusfile; do +for pkg in pkg-config libtool libpng zlib ncurses pdcurses SDL2 SDL2_net opusfile; do packages+=("mingw-w64-${pkg_type}-${pkg}") done diff --git a/scripts/automator/packages/manager-pacman b/scripts/automator/packages/manager-pacman index 54f7243f..b3e9a6b8 100644 --- a/scripts/automator/packages/manager-pacman +++ b/scripts/automator/packages/manager-pacman @@ -1,4 +1,4 @@ # Package repo: https://www.archlinux.org/packages/ # Arch offers 32-bit versions of SDL (but not others) -packages+=(xvfb libtool ncurses sdl_net opusfile) -[[ "${bits}" == "32" ]] && packages+=(lib32-sdl) || packages+=(sdl) +packages+=(xvfb libtool ncurses sdl2_net opusfile) +[[ "${bits}" == "32" ]] && packages+=(lib32-sdl2) || packages+=(sdl2) diff --git a/scripts/automator/packages/manager-vcpkg b/scripts/automator/packages/manager-vcpkg index ffaa3108..5ed8ab8e 100644 --- a/scripts/automator/packages/manager-vcpkg +++ b/scripts/automator/packages/manager-vcpkg @@ -1,2 +1,2 @@ # Package repo: https://repology.org/projects/?inrepo=vcpkg -packages+=(libpng pdcurses sdl1 sdl1-net opusfile) +packages+=(libpng pdcurses sdl2 sdl2-net opusfile) diff --git a/scripts/automator/packages/manager-zypper b/scripts/automator/packages/manager-zypper index 80de6b13..9344106c 100644 --- a/scripts/automator/packages/manager-zypper +++ b/scripts/automator/packages/manager-zypper @@ -3,8 +3,7 @@ packages+=(devel_basis xvfb libtool opusfile) if [[ "${bits}" == "32" ]]; then - packages+=(ncurses-devel-32bit libSDL-devel-32bit libSDL_net-devel-32bit) + packages+=(ncurses-devel-32bit libSDL2-devel-32bit libSDL2_net-devel-32bit) else - packages+=(ncurses-devel SDL SDL_net) + packages+=(ncurses-devel SDL2 SDL2_net) fi -