valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Update CI to target SDL2

Browse source
This commit is contained in:
Patryk Obara 2019-12-22 04:08:02 +01:00 • committed by Patryk Obara
parent 185c8af6f5
commit 44c7fb9165
9 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/windows.yml vendored
View file

@ -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

2
scripts/automator/packages/manager-apt
View file

@ -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)

2
scripts/automator/packages/manager-brew
View file

@ -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)

2
scripts/automator/packages/manager-dnf
View file

@ -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)

2
scripts/automator/packages/manager-macports
View file

@ -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)

2
scripts/automator/packages/manager-msys2
View file

@ -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

4
scripts/automator/packages/manager-pacman
View file

@ -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)

2
scripts/automator/packages/manager-vcpkg
View file

@ -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)

5
scripts/automator/packages/manager-zypper
View file

@ -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