X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=xonotic-linux-glx.sh;h=346ff72b6bd2df6def3c12e9c2263ac6cb642557;hb=a39370ebba15e56b74b1a4a93ef0cd5abb5e84f3;hp=5461a4cc196b5cfed3901c11907eb815a7c83b6f;hpb=2ec7592650fe8ad01d877f7c6887d9f9dda143af;p=xonotic%2Fxonotic.git

diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh
index 5461a4cc..346ff72b 100755
--- a/xonotic-linux-glx.sh
+++ b/xonotic-linux-glx.sh
@@ -7,16 +7,17 @@ link=`readlink "${0}"`
 cd "${path}"
 
 case "${0##*/}" in
+  *dedicated*)	mode="dedicated" ;;
   *sdl*)	mode="sdl" ;;
   *)		mode="glx" ;;
 esac
 
 case "$(uname -m)" in
-  x86_64)	arch="x86_64" ;;
-  *)		arch="686" ;;
+  x86_64)	arch="linux64" ;;
+  *)		arch="linux32" ;;
 esac
 
-xonotic="xonotic-linux-${arch}-${mode}"
+xonotic="xonotic-${arch}-${mode}"
 
 set -- ./${xonotic} "${@}"
 
@@ -118,4 +119,13 @@ 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 "$@"