Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic

diff --combined all
index 15a98b79b908adf03a2fdb14155ec56ce402215d,a96e8880db2c514c63f6871c8db1d928413b1faa..729cce2297c447736e9abfa44f9972c1239a26c5
--- 1/all
--- 2/all
+++ b/all
@@@ -352,25 -352,6 +352,25 @@@ case "$cmd" i
                done
                ;;
        compile)
 +              if [ -n "$WE_HATE_OUR_USERS" ]; then
 +                      TARGETS="sv-debug cl-debug"
 +              else
 +                      TARGETS="sv-debug cl-debug sdl-debug"
 +              fi
 +              case "$1" in
 +                      sdl)
 +                              TARGETS="sdl-debug"
 +                              shift
 +                              ;;
 +                      glx|agl|wgl)
 +                              TARGETS="cl-debug"
 +                              shift
 +                              ;;
 +                      dedicated)
 +                              TARGETS="sv-debug"
 +                              shift
 +                              ;;
 +              esac
                if [ -z "$MAKEFLAGS" ]; then
                        if [ -f /proc/cpuinfo ]; then
                                ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
@@@ -384,13 -365,16 +384,14 @@@
                enter "$d0/data/xonotic-data.pk3dir" verbose
                verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS
                enter "$d0/darkplaces" verbose
 -              verbose make $MAKEFLAGS sv-debug
 -              verbose make $MAKEFLAGS cl-debug
 -              if ! [ -n "$WE_HATE_OUR_USERS" ]; then
 -                      verbose make $MAKEFLAGS sdl-debug
 -              fi
 +              for T in $TARGETS; do
 +                      verbose make $MAKEFLAGS "$T"
 +              done
                ;;
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
+                       export PATH="$d0/misc/buildfiles/w32:$PATH"
                else
                        client=-sdl
                fi