Merge pull request #115 from ekrctb/fix-i386

Fix linux-x86 build failure and improve apt-get command line
This commit is contained in:
Dean Herbert 2022-05-23 13:13:48 +09:00 committed by GitHub
commit 562fc2fcfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -27,13 +27,16 @@ jobs:
- name: Setup Linux dependencies
if: runner.os == 'Linux'
run: |
# TODO: only run this command on i386
sudo dpkg --add-architecture i386
sudo add-apt-repository ppa:team-xbmc/ppa
[[ ${{ matrix.platform.target_apt_arch }} == :i386 ]] && sudo dpkg --add-architecture i386
sudo apt-get update -y -qq
sudo apt-get install wayland-protocols${{ matrix.platform.target_apt_arch }} \
sudo apt-get install -y \
gcc-multilib \
g++-multilib \
cmake \
ninja-build \
wayland-scanner++ \
wayland-protocols \
pkg-config${{ matrix.platform.target_apt_arch }} \
ninja-build${{ matrix.platform.target_apt_arch }} \
libasound2-dev${{ matrix.platform.target_apt_arch }} \
libdbus-1-dev${{ matrix.platform.target_apt_arch }} \
libegl1-mesa-dev${{ matrix.platform.target_apt_arch }} \
@ -59,12 +62,7 @@ jobs:
libxxf86vm-dev${{ matrix.platform.target_apt_arch }} \
libdrm-dev${{ matrix.platform.target_apt_arch }} \
libgbm-dev${{ matrix.platform.target_apt_arch }} \
libpulse-dev${{ matrix.platform.target_apt_arch }} \
libwayland-client++0$ \
libwayland-cursor++0$ \
wayland-scanner++ \
gcc-multilib \
g++-multilib
libpulse-dev${{ matrix.platform.target_apt_arch }}
- uses: actions/checkout@v2
with:
repository: libsdl-org/SDL