X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=xonotic-linux-sdl.sh;h=f96c83f9d0af0ed70632c8e1c517f1a0875c4b13;hp=e2213715be0e9c320b9ec39beba23072d1ca4d44;hb=2e7a83c04aa15f6061d2d3b2e9c097763428683f;hpb=0360202b4d19c963ae5f57f42ed370a6de67799a

diff --git a/xonotic-linux-sdl.sh b/xonotic-linux-sdl.sh
index e2213715..f96c83f9 100755
--- a/xonotic-linux-sdl.sh
+++ b/xonotic-linux-sdl.sh
@@ -8,6 +8,7 @@ cd "${path}"
 
 case "${0##*/}" in
   *dedicated*)	mode="dedicated" ;;
+  *glx*)	mode="glx" ;;
   *)		mode="sdl" ;;
 esac
 
@@ -16,7 +17,10 @@ case "$(uname -m)" in
   *)	arch="linux64" ;;
 esac
 
-xonotic="xonotic-${arch}-${mode}"
+# prefer locally built binary if available (see: Makefile)
+xonotic="xonotic-local-${mode}"
+[ -x "$xonotic" ] || xonotic="xonotic-${arch}-${mode}"
+echo "Executing: $xonotic ${@}"
 
 set -- ./${xonotic} "${@}"
 
@@ -118,13 +122,4 @@ case "$xserver" in
 		;;
 esac
 
-# if pulseaudio
-if [ -z "$SDL_AUDIODRIVER" ]; then
-	if ps -C pulseaudio >/dev/null; then
-		if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-			export SDL_AUDIODRIVER=pulse
-		fi
-	fi
-fi
-
 exec "$@"