diff --git a/scripts/gha/build_linux.sh b/scripts/gha/build_linux.sh index 7a0ed5d2..d3f3ed33 100755 --- a/scripts/gha/build_linux.sh +++ b/scripts/gha/build_linux.sh @@ -66,9 +66,6 @@ build_appimage() ./waf install --destdir="$APPDIR" || die - # Generate extras.pak - python3 scripts/makepak.py xash-extras/ "$APPDIR/extras.pak" - cp SDL2_linux/lib/libSDL2-2.0.so.0 "$APPDIR/" if [ "$ARCH" = "i386" ]; then cp vgui_support/vgui-dev/lib/vgui.so "$APPDIR/" @@ -83,7 +80,7 @@ fi echo "Xash3D FWGS installed as AppImage." echo "Base directory is $XASH3D_BASEDIR. Set XASH3D_BASEDIR environment variable to override this" -export XASH3D_EXTRAS_PAK1="${APPDIR}"/extras.pak +export XASH3D_EXTRAS_PAK1="${APPDIR}"/valve/extras.pk3 ${DEBUGGER} "${APPDIR}"/xash3d "$@" exit $? EOF diff --git a/scripts/gha/build_motomagx.sh b/scripts/gha/build_motomagx.sh index c103bd42..fda2c356 100755 --- a/scripts/gha/build_motomagx.sh +++ b/scripts/gha/build_motomagx.sh @@ -23,14 +23,11 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3 export HOME=$mypath export SDL_QT_INVERT_ROTATION=1 export SWAP_PATH=$HOME/xash.swap -export XASH3D_EXTRAS_PAK1=$HOME/extras.pak cd $mypath sleep 1 exec $mypath/xash -dev $@ EOF -python3 scripts/makepak.py xash-extras/ Xash/extras.pak - mkdir -p artifacts/ 7z a -t7z artifacts/xash3d-fwgs-magx.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on -r Xash/ diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh index be8bc506..5154153d 100755 --- a/scripts/gha/build_win32.sh +++ b/scripts/gha/build_win32.sh @@ -24,9 +24,6 @@ else die fi -mkdir valve/ -python3 scripts/makepak.py xash-extras/ valve/extras.pak - mkdir -p artifacts/ 7z a -t7z artifacts/xash3d-fwgs-win32-$ARCH.7z -m0=lzma2 -mx=9 -mfb=64 -md=32m -ms=on \ *.dll *.exe *.pdb activities.txt \