Remove support for the glx binary.

[xonotic/xonotic.git] / misc / tools / all / xonotic.subr

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 3b9b393508e5435f144a59a756b567f0d640923b..9118c5054d6219e414be2692363a4028ae66ac3f 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -83,11 +83,9 @@ case "$cmd" in
                        esac
                done
 
                        esac
                done
 

+               TARGETS="sv-$debug sdl-$debug"

                if [ x"`uname`" = x"Darwin" ]; then
                if [ x"`uname`" = x"Darwin" ]; then

-                       TARGETS="sv-$debug sdl-$debug"

                        export CC="$CC -fno-reorder-blocks"
                        export CC="$CC -fno-reorder-blocks"

-               else
-                       TARGETS="sv-$debug cl-$debug sdl-$debug"

                fi
 
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
                fi
 
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then


@@ -104,9 +102,6 @@ case "$cmd" in
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;
                                        sdl)
                                                TARGETS="$TARGETS sdl-$debug"
                                                ;;

-                                       glx|wgl)
-                                               TARGETS="$TARGETS cl-$debug"
-                                               ;;

                                        dedicated)
                                                TARGETS="$TARGETS sv-$debug"
                                                ;;
                                        dedicated)
                                                TARGETS="$TARGETS sv-$debug"
                                                ;;


@@ -322,16 +317,11 @@ case "$cmd" in
                                client=-$1
                                shift
                                ;;
                                client=-$1
                                shift
                                ;;

-                       sdl|glx)
+                       sdl)

                                USE_RLWRAP=no
                                client=-$1
                                shift
                                ;;
                                USE_RLWRAP=no
                                client=-$1
                                shift
                                ;;

-                       wgl)
-                               USE_RLWRAP=no
-                               client=
-                               shift
-                               ;;

                esac
                if ! [ -x "darkplaces/darkplaces$client" ]; then
                        if [ -x "darkplaces/darkplaces$client.exe" ]; then
                esac
                if ! [ -x "darkplaces/darkplaces$client" ]; then
                        if [ -x "darkplaces/darkplaces$client.exe" ]; then


@@ -383,9 +373,9 @@ case "$cmd" in
                fi
                ;;
        help)
                fi
                ;;
        help)

-               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|glx|wgl|dedicated]"
+               $ECHO "  $SELF compile [-c] [-qc] [-r|-p] [-0] [sdl|dedicated]"

                $ECHO "  $SELF update-maps"
                $ECHO "  $SELF update-maps"

-               $ECHO "  $SELF run [sdl|glx|wgl|dedicated] options..."
+               $ECHO "  $SELF run [sdl|dedicated] options..."

                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;
                $ECHO "  $SELF compile-map mapname1 mapname2... (e.g. \"./all compile-map dance drain fuse\")"
                handled=false
                ;;