remove GPU libs to test if those work on non-amd too

This commit is contained in:
Miepee 2021-11-04 10:50:58 +01:00
parent 2ffb6a38b3
commit f25eeedb89
43 changed files with 16 additions and 12 deletions

6
.gitignore vendored
View file

@ -1,3 +1,3 @@
am2r_15_2/
ARCHIVE-am2r_15_2/
AM2R_11.zip
am2r_*/
ARCHIVE-am2r_*/
AM2R_11.zip

View file

@ -1,23 +1,27 @@
#! /usr/bin/env bash
#!/usr/bin/env bash
# make sure errors in sourced scripts will cause this script to stop
set -e
export LD_LIBRARY_PATH="$APPDIR/usr/lib:$LD_LIBRARY_PATH"
this_dir="$(readlink -f "$(dirname "$0")")"
# TODO: are these even necessary now anymore?
# fix the GPU crashes here
# AMD should already be fixed due it executing a file named "runner"
if [ lspci | grep "VGA compatible controller: Advanced Micro Devices"]; then
if lspci | grep -q "VGA compatible controller: Advanced Micro Devices" ; then
echo "AMD GPU detected"
#export radeonsi_sync_compile=true
# Intel fix. Won't care to differentiate for ubuntu here
elif [ lspci | grep "VGA compatible controller: Intel" ]; then
elif lspci | grep -q "VGA compatible controller: Intel"; then
echo "Intel GPU detected"
export LIBGL_DRI3_DISABLE=1
#export LIBGL_DRI3_DISABLE=1
# Nvidia fix.
elif [ lspci | grep "VGA compatible controller: NVIDIA Corporation" ]; then
elif echo gpuText | grep -q "VGA compatible controller: NVIDIA Corporation"; then
echo "NVIDIA GPU detected"
export LIBGL_ALWAYS_INDIRECT=1
#export LIBGL_ALWAYS_INDIRECT=1
fi
exec "$this_dir"/AppRun-game "$@"
exec "$this_dir"/AppRun-game

View file

@ -1,7 +1,7 @@
[Desktop Entry]
Categories=Game;
Comment=Another Metroid 2 Remake (Community Edition)
Exec=AM2R
Exec=runner
Icon=icon
Name=AM2R
Type=Application

View file

@ -133,7 +133,7 @@ if (type == '1'):
#create AppImage
print("Creating Appimage...")
copytree("data/AM2R.AppDir", "AM2R.AppDir")
copytree("data/AM2R.AppDir", "AM2R.AppDir", symlinks=True)
subprocess.call(["cp", "-rpT", output , "AM2R.AppDir/usr/bin"])
fd = os.open("/dev/null", os.O_WRONLY)
savefd = os.dup(2)