Merge branch 'cmake-q3map2' into 'master'

all: compile q3map2 using cmake

See merge request xonotic/xonotic!45

diff --combined misc/tools/all/xonotic.subr
index 9bc4cd6ea1714c21791078860865dd12d215ed02,2be0bdff438c6bfa084afbc99324ea40184748db..0938974ca9b46bcfa8fd36442cf7de74267d49b7
--- 1/misc/tools/all/xonotic.subr
--- 2/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@@ -8,9 -8,10 +8,10 @@@ case "$cmd" i
                        msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
                        msg "For example: ./all compile-map dance xoylent"
                fi
-               if ! [ -f "netradiant/install/q3map2" ] ; then
-                       msg "q3map2 needed! Building netradiant..."
-                       make -C netradiant BUILD=native install/q3map2
+               if ! [ -f "netradiant/build/q3map2" ] ; then
+                       msg "q3map2 needed! Building q3map2..."
+                       cmake -H'netradiant' -B'netradiant/build' -G'Unix Makefiles' -D'CMAKE_BUILD_TYPE=Release' -DBUILD_RADIANT=OFF -DDOWNLOAD_GAMEPACKS=OFF
+                       cmake --build 'netradiant/build' -- q3map2
                fi
                for mapfile in "$@"; do
                        mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
@@@ -27,7 -28,7 +28,7 @@@
                cleanqcc=false
                cleanqc=false
                compiled0=
 -              debug=debug
 +              debug=release  # when changing this default, change the description in the zsh autocompletion script
                if [ -z "$CC" ]; then
                        export CC="gcc"
                fi
@@@ -53,11 -54,8 +54,11 @@@
                                        cleanqc=true
                                        shift
                                        ;;
 -                              -r|-p)
 +                              -d|-p|-r)
                                        case "$1" in
 +                                              -d)
 +                                                      debug=debug
 +                                                      ;;
                                                -p)
                                                        debug=profile
                                                        ;;
@@@ -86,13 -84,9 +87,13 @@@
                        esac
                done
  
 -              TARGETS="sv-$debug sdl-$debug"
                if [ x"`uname`" = x"Darwin" ]; then
 +                      TARGETS="sv-$debug sdl-$debug"
                        export CC="$CC -fno-reorder-blocks"
 +              elif [ -n "$WE_HATE_OUR_USERS" ]; then
 +                      TARGETS="sv-$debug sdl-$debug"
 +              else
 +                      TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
  
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@@ -109,9 -103,6 +110,9 @@@
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
 +                                      glx)
 +                                              TARGETS="$TARGETS cl-$debug"
 +                                              ;;
                                        dedicated)
                                                TARGETS="$TARGETS sv-$debug"
                                                ;;
@@@ -331,10 -322,6 +332,10 @@@
                        sdl)
                                shift
                                ;;
 +                      glx)
 +                              client=-$1
 +                              shift
 +                              ;;
                esac
  
                if ! [ -x "darkplaces/darkplaces$client" ]; then
@@@ -387,9 -374,9 +388,9 @@@
                fi
                ;;
        help)
 -              $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [-1] [sdl|dedicated]"
 +              $ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|glx|dedicated]"
                $ECHO "  $SELF update-maps"
 -              $ECHO "  $SELF run [sdl|dedicated] options..."
 +              $ECHO "  $SELF run [sdl|glx|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;