Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

[xonotic/xonotic.git] / xonotic-linux-glx.sh

diff --git a/xonotic-linux-glx.sh b/xonotic-linux-glx.sh
index 5461a4cc196b5cfed3901c11907eb815a7c83b6f..03588c0c1d1b4f7922bb10cbecc96c33e0000424 100755 (executable)
--- a/xonotic-linux-glx.sh
+++ b/xonotic-linux-glx.sh
@@ -12,11 +12,11 @@ case "${0##*/}" in
 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 +118,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 "$@"