Merge branch 'bones_was_here/all_no_glx' into 'master'

Remove GLX client support in developer builds (./all compile)

See merge request xonotic/xonotic!95

diff --combined misc/tools/all/xonotic.subr
index 433073159b029518f0aea1ab264ba21234426c02,d0e44f4b15a98dda32c2a2f2905622aa9a669d9f..3acd42e51926e4dd2c93d70dfae106f1a244711c
--- 1/misc/tools/all/xonotic.subr
--- 2/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@@ -87,13 -87,9 +87,9 @@@ case "$cmd" i
                        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
@@@ -110,9 -106,6 +106,6 @@@
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
-                                       glx)
-                                               TARGETS="$TARGETS cl-$debug"
-                                               ;;
                                        dedicated)
                                                TARGETS="$TARGETS sv-$debug"
                                                ;;
@@@ -332,10 -325,6 +325,6 @@@
                        sdl)
                                shift
                                ;;
-                       glx)
-                               client=-$1
-                               shift
-                               ;;
                esac
  
                if ! [ -x "darkplaces/darkplaces$client" ]; then
@@@ -348,6 -337,15 +337,6 @@@
                fi
                set -- "darkplaces/darkplaces$client" -xonotic "$@"
  
 -              # if pulseaudio is running: USE IT
 -              if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; 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
 -
                binary=$1
  
                if [ x"$USE_GDB" = x"yes" ]; then
@@@ -379,9 -377,9 +368,9 @@@
                fi
                ;;
        help)
-               $ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|glx|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-d|-p|-r] [-0] [-1] [sdl|dedicated]"
                $ECHO "  $SELF update-maps"
-               $ECHO "  $SELF run [sdl|glx|dedicated] options..."
+               $ECHO "  $SELF run [sdl|dedicated] options..."
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;