Remove GLX client support in developer builds (./all compile) 95/head
authorbones_was_here <bones_was_here@xa.org.au>
Sun, 20 Feb 2022 20:26:28 +0000 (06:26 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Wed, 23 Feb 2022 14:45:11 +0000 (00:45 +1000)
This allows `./all compile` to build current DarkPlaces.

misc/tools/all/xonotic.subr
misc/tools/all/zsh_autocompletion/all/_all

index 35ce643154553ff53f139592e02fdb35c977475d..d0e44f4b15a98dda32c2a2f2905622aa9a669d9f 100644 (file)
@@ -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
                ;;
index f4a8e6dbbb18e7c450f5830699f44d156c94baf4..98f391ccd0d2b0d5594a049944988cf0088daacb 100644 (file)
@@ -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]' \