From: bones_was_here <bones_was_here@xa.org.au>
Date: Sun, 20 Feb 2022 20:26:28 +0000 (+1000)
Subject: Remove GLX client support in developer builds (./all compile)
X-Git-Tag: xonotic-v0.8.6~30^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=e62003cbc45174fdef55606d15a66dfad80bfde1;hp=5d1ddcda4b50b35d2c30c2290f727a85e467cb3c

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

This allows `./all compile` to build current DarkPlaces.
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 35ce6431..d0e44f4b 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -87,13 +87,9 @@ case "$cmd" in
 			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 @@ case "$cmd" in
 					sdl)
 						TARGETS="$TARGETS sdl-$debug"
 						;;
-					glx)
-						TARGETS="$TARGETS cl-$debug"
-						;;
 					dedicated)
 						TARGETS="$TARGETS sv-$debug"
 						;;
@@ -332,10 +325,6 @@ case "$cmd" in
 			sdl)
 				shift
 				;;
-			glx)
-				client=-$1
-				shift
-				;;
 		esac
 
 		if ! [ -x "darkplaces/darkplaces$client" ]; then
@@ -388,9 +377,9 @@ case "$cmd" in
 		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
 		;;
diff --git a/misc/tools/all/zsh_autocompletion/all/_all b/misc/tools/all/zsh_autocompletion/all/_all
index f4a8e6db..98f391cc 100644
--- a/misc/tools/all/zsh_autocompletion/all/_all
+++ b/misc/tools/all/zsh_autocompletion/all/_all
@@ -44,12 +44,12 @@ case $state in
             # choose version and autocomplete cvars
             # possible TODO: check for OS and adapt to it
             _arguments \
-                '1:Version:(sdl glx dedicated)' && ret=0
+                '1:Version:(sdl dedicated)' && ret=0
             ;;
 
         compile)
             _arguments \
-                '1:Version:(sdl glx dedicated)' \
+                '1:Version:(sdl dedicated)' \
                 "-0[don't use precompiled d0_blind_id]" \
                 "-1[don't compile d0_blind_id]" \
                 '-c[clean all before building]' \