X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=xonotic-linux-sdl.sh;h=f96c83f9d0af0ed70632c8e1c517f1a0875c4b13;hp=e4ae857ee80ea6468f30ebffd29325c80e8af302;hb=975add8a2e50e075479a329ff898da7957403ac4;hpb=3125fa3054f80110424c799d6961f6c49e9baf9b diff --git a/xonotic-linux-sdl.sh b/xonotic-linux-sdl.sh index e4ae857e..f96c83f9 100755 --- a/xonotic-linux-sdl.sh +++ b/xonotic-linux-sdl.sh @@ -17,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} "${@}" @@ -119,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 "$@"