RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-21 04:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

./all compile: ignore merge conflicts. The compiler will tell anyway...

Browse Source
This commit is contained in:
Rudolf Polzer 2011-03-09 18:25:37 +01:00
parent c448e52f93
commit e32ac5f1d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
all
View File

@ -939,7 +939,7 @@ case "$cmd" in
fi
fi
enter "$d0/d0_blind_id" verbose
verbose cd "$d0/d0_blind_id"
if ! $compiled0; then
# compilation of crypto library failed
# use binaries then, if we can...
@ -992,20 +992,20 @@ case "$cmd" in
verbose make $MAKEFLAGS
fi
enter "$d0/fteqcc" verbose
verbose cd "$d0/fteqcc"
if $cleanqcc; then
verbose make $MAKEFLAGS clean
fi
verbose make $MAKEFLAGS
enter "$d0/data/xonotic-data.pk3dir" verbose
verbose cd "$d0/data/xonotic-data.pk3dir"
if $cleanqc; then
verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
fi
verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
# 4 levels up: data, xonotic-data, qcsrc, server
enter "$d0/darkplaces" verbose
verbose cd "$d0/darkplaces"
if [ x"$BAD_TARGETS" = x" " ]; then
$ECHO "Warning: invalid empty client, default clients will be used."
fi