build watermark too

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 349dae1dab2ecd3ad87142488647151a02d65e30..d9b08f962e0b50f395d056810f38beb08c363621 100755 (executable)
--- a/all
+++ b/all
@@ -134,7 +134,15 @@ netradiant                    |
 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
 
 base=`git config remote.origin.url`
-base=${base%xonotic.git}
+case "$base" in
+       */xonotic.git)
+               base=${base%xonotic.git}
+               ;;
+       *)
+               echo "The main repo is not xonotic.git, what have you done?"
+               exit 1
+               ;;
+esac
 
 repourl()
 {
@@ -457,6 +465,7 @@ case "$cmd" in
                if $clean; then
                        verbose make $MAKEFLAGS clean
                fi
+               verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
                enter "$d0/darkplaces" verbose
                if $clean; then
@@ -495,6 +504,14 @@ case "$cmd" in
                        fi
                fi
                set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
+
+               # if pulseaudio is running: USE IT
+               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
+
                if [ -n "$USE_GDB" ]; then
                        set -- gdb --args "$@"
                fi