Skip to content

Commit 243b45b

Browse files
authored
update ares build process (#26)
* update build process * `ARES_BUNDLE_SHADERS=ON` * should not be needed anymore * add `libretro-shaders-slang`
1 parent 8684d62 commit 243b45b

File tree

2 files changed

+31
-40
lines changed

2 files changed

+31
-40
lines changed

ares-appimage.sh

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,17 @@ fi
2424
# BUILD ARES
2525
(
2626
cd ./ares
27-
28-
# backport fix from aur package
29-
sed -i \
30-
"s/virtual auto saveName() -> string { return pak->attribute(\"name\"); }/virtual auto saveName() -> string { return name(); }/g" \
31-
./mia/pak/pak.hpp
32-
3327
mkdir ./build
3428
cd ./build
3529
cmake .. -G Ninja \
3630
-W no-dev \
37-
-D CMAKE_BUILD_TYPE=Release \
38-
-D ENABLE_CCACHE=ON \
31+
-D CMAKE_BUILD_TYPE=Release \
32+
-D ENABLE_CCACHE=ON \
33+
-D ARES_BUNDLE_SHADERS=ON \
34+
-D ARES_BUILD_LOCAL=OFF \
3935
-D CMAKE_INSTALL_PREFIX="/usr" \
40-
-D ARES_BUILD_OFFICIAL=YES \
41-
-D ARES_SKIP_DEPS=ON \
36+
-D ARES_BUILD_OFFICIAL=YES \
37+
-D ARES_SKIP_DEPS=ON \
4238
--fresh
4339
cmake --build . -j"$(nproc)"
4440
cmake --install .
@@ -58,11 +54,6 @@ export ICON=/usr/share/icons/hicolor/256x256/apps/ares.png
5854
export DEPLOY_OPENGL=1
5955
export DEPLOY_PIPEWIRE=1
6056

61-
# "fix" xvfb-run failing to kill the process in aarch64
62-
if [ "$ARCH" = "aarch64" ]; then
63-
sed -i 's#kill $XVFBPID#kill $XVFBPID || true#' "$(command -v xvfb-run)"
64-
fi
65-
6657
# ADD LIBRARIES
6758
wget --retry-connrefused --tries=30 "$SHARUN" -O ./quick-sharun
6859
chmod +x ./quick-sharun

get-dependencies.sh

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@ EXTRA_PACKAGES="https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImage
66
echo "Installing dependencies..."
77
echo "---------------------------------------------------------------"
88
pacman -Syu --noconfirm \
9-
base-devel \
10-
cmake \
11-
ccache \
12-
curl \
13-
gcc-libs \
14-
git \
15-
gtk3 \
16-
libao \
17-
libdecor \
18-
libpulse \
19-
libretro-shaders \
20-
libx11 \
21-
libxrandr \
22-
libxss \
23-
ninja \
24-
openal \
25-
pipewire-audio \
26-
pkgconf \
27-
pulseaudio \
28-
pulseaudio-alsa \
29-
rust \
30-
sdl3 \
31-
wget \
32-
xorg-server-xvfb \
33-
zlib \
9+
base-devel \
10+
cmake \
11+
ccache \
12+
curl \
13+
gcc-libs \
14+
git \
15+
gtk3 \
16+
libao \
17+
libdecor \
18+
libpulse \
19+
libretro-shaders-slang \
20+
libx11 \
21+
libxrandr \
22+
libxss \
23+
ninja \
24+
openal \
25+
pipewire-audio \
26+
pkgconf \
27+
pulseaudio \
28+
pulseaudio-alsa \
29+
rust \
30+
sdl3 \
31+
wget \
32+
xorg-server-xvfb \
33+
zlib \
3434
zsync
3535

3636

0 commit comments

Comments
 (0)