RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-04 10:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This allows `./all compile` to build current DarkPlaces.
This commit is contained in:
bones_was_here 2022-02-21 06:26:28 +10:00
parent 5d1ddcda4b
commit e62003cbc4
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
misc/tools/all/xonotic.subr
View 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
;;

4
misc/tools/all/zsh_autocompletion/all/_all
View 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]' \