Skip to content

Commit cec6067

Browse files
committed
Install the architecture specific version of each compile dependency
x64/amd64 is handled the same way for consistency.
1 parent 7756e45 commit cec6067

3 files changed

Lines changed: 24 additions & 18 deletions

File tree

sources/SDL/Native/build-linux-arm.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
77
../../../eng/native/buildsystem/download-zig.py
88
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
99
# Dependency list is from https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
10+
sudo dpkg --add-architecture arm
1011
sudo apt-get update
1112
sudo apt-get install build-essential git make \
12-
pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
13-
libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
14-
libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
15-
libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
16-
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
17-
libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
13+
pkg-config cmake ninja-build gnome-desktop-testing \
14+
libasound2-dev:arm libpulse-dev:arm \
15+
libaudio-dev:arm libfribidi-dev:arm libjack-dev:arm libsndio-dev:arm libx11-dev:arm libxext-dev:arm \
16+
libxrandr-dev:arm libxcursor-dev:arm libxfixes-dev:arm libxi-dev:arm libxss-dev:arm libxtst-dev:arm \
17+
libxkbcommon-dev:arm libdrm-dev:arm libgbm-dev:arm libgl1-mesa-dev:arm libgles2-mesa-dev:arm \
18+
libegl1-mesa-dev:arm libdbus-1-dev:arm libibus-1.0-dev:arm libudev-dev:arm libthai-dev:arm \
19+
libpipewire-0.3-dev:arm libwayland-dev:arm libdecor-0-dev:arm liburing-dev
1820
fi
1921
rm -rf build
2022
mkdir build

sources/SDL/Native/build-linux-arm64.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
77
../../../eng/native/buildsystem/download-zig.py
88
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
99
# Dependency list is from https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
10+
sudo dpkg --add-architecture arm64
1011
sudo apt-get update
1112
sudo apt-get install build-essential git make \
12-
pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
13-
libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
14-
libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
15-
libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
16-
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
17-
libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
13+
pkg-config cmake ninja-build gnome-desktop-testing \
14+
libasound2-dev:arm64 libpulse-dev:arm64 \
15+
libaudio-dev:arm64 libfribidi-dev:arm64 libjack-dev:arm64 libsndio-dev:arm64 libx11-dev:arm64 libxext-dev:arm64 \
16+
libxrandr-dev:arm64 libxcursor-dev:arm64 libxfixes-dev:arm64 libxi-dev:arm64 libxss-dev:arm64 libxtst-dev:arm64 \
17+
libxkbcommon-dev:arm64 libdrm-dev:arm64 libgbm-dev:arm64 libgl1-mesa-dev:arm64 libgles2-mesa-dev:arm64 \
18+
libegl1-mesa-dev:arm64 libdbus-1-dev:arm64 libibus-1.0-dev:arm64 libudev-dev:arm64 libthai-dev:arm64 \
19+
libpipewire-0.3-dev:arm64 libwayland-dev:arm64 libdecor-0-dev:arm64 liburing-dev
1820
fi
1921
rm -rf build
2022
mkdir build

sources/SDL/Native/build-linux-x64.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
77
../../../eng/native/buildsystem/download-zig.py
88
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
99
# Dependency list is from https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
10+
sudo dpkg --add-architecture amd64
1011
sudo apt-get update
1112
sudo apt-get install build-essential git make \
12-
pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
13-
libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
14-
libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
15-
libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
16-
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
17-
libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
13+
pkg-config cmake ninja-build gnome-desktop-testing \
14+
libasound2-dev:amd64 libpulse-dev:amd64 \
15+
libaudio-dev:amd64 libfribidi-dev:amd64 libjack-dev:amd64 libsndio-dev:amd64 libx11-dev:amd64 libxext-dev:amd64 \
16+
libxrandr-dev:amd64 libxcursor-dev:amd64 libxfixes-dev:amd64 libxi-dev:amd64 libxss-dev:amd64 libxtst-dev:amd64 \
17+
libxkbcommon-dev:amd64 libdrm-dev:amd64 libgbm-dev:amd64 libgl1-mesa-dev:amd64 libgles2-mesa-dev:amd64 \
18+
libegl1-mesa-dev:amd64 libdbus-1-dev:amd64 libibus-1.0-dev:amd64 libudev-dev:amd64 libthai-dev:amd64 \
19+
libpipewire-0.3-dev:amd64 libwayland-dev:amd64 libdecor-0-dev:amd64 liburing-dev
1820
fi
1921
rm -rf build
2022
mkdir build

0 commit comments

Comments
 (0)