Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-22 05:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "CI/AppImage: Don't bundle libssl/libcrypto"

Browse source 
This reverts commit a2abcc9bb3.
This commit is contained in:
Stenzek 2024-05-18 17:30:47 +10:00
parent 14c30dfa80
commit bd0cf6582c
No known key found for this signature in database
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/appimage/make-appimage.sh
View file

@ -55,11 +55,6 @@ BINARY=duckstation-qt
APPDIRNAME=DuckStation.AppDir APPDIRNAME=DuckStation.AppDir
STRIP=strip STRIP=strip
declare -a EXCLUDE_LIBS=(
'libcrypto.so*'
'libssl.so*'
)
declare -a MANUAL_LIBS=( declare -a MANUAL_LIBS=(
"libshaderc_shared.so.1" "libshaderc_shared.so.1"
) )
@ -100,7 +95,7 @@ OUTDIR=$(realpath "./$APPDIRNAME")
rm -fr "$OUTDIR" rm -fr "$OUTDIR"
echo "Locating extra libraries..." echo "Locating extra libraries..."
declare -a EXTRA_LIBS_ARGS=() EXTRA_LIBS_ARGS=""
for lib in "${MANUAL_LIBS[@]}"; do for lib in "${MANUAL_LIBS[@]}"; do
srcpath=$(find "$DEPSDIR" -name "$lib") srcpath=$(find "$DEPSDIR" -name "$lib")
if [ ! -f "$srcpath" ]; then if [ ! -f "$srcpath" ]; then
@ -110,12 +105,11 @@ for lib in "${MANUAL_LIBS[@]}"; do
echo "Found $lib at $srcpath." echo "Found $lib at $srcpath."
EXTRA_LIBS_ARGS+=("--library=$srcpath") if [ "$EXTRA_LIBS_ARGS" == "" ]; then
done EXTRA_LIBS_ARGS="--library=$srcpath"
else
declare -a EXCLUDE_LIBS_ARGS=() EXTRA_LIBS_ARGS="$EXTRA_LIBS_ARGS,$srcpath"
for lib in "${EXCLUDE_LIBS[@]}"; do fi
EXCLUDE_LIBS_ARGS+=("--exclude-library=$lib")
done done
# Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off. # Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off.
@ -140,8 +134,7 @@ EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
DEPLOY_PLATFORM_THEMES="1" \ DEPLOY_PLATFORM_THEMES="1" \
QMAKE="$DEPSDIR/bin/qmake" \ QMAKE="$DEPSDIR/bin/qmake" \
NO_STRIP="1" \ NO_STRIP="1" \
$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/duckstation-qt" \ $LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/duckstation-qt" $EXTRA_LIBS_ARGS \
"${EXTRA_LIBS_ARGS[@]}" "${EXCLUDE_LIBS_ARGS[@]}" \
--desktop-file="$ROOTDIR/scripts/org.duckstation.DuckStation.desktop" \ --desktop-file="$ROOTDIR/scripts/org.duckstation.DuckStation.desktop" \
--icon-file="$ROOTDIR/scripts/org.duckstation.DuckStation.png" \ --icon-file="$ROOTDIR/scripts/org.duckstation.DuckStation.png" \