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

SWITCH TO GMQCC. Use USE_FTEQCC=yes to use fteqcc.

Browse Source
This commit is contained in:
Rudolf Polzer 2013-01-25 09:57:12 +01:00
parent 86b5ebb976
commit 86bcfca17c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/tools/all/release.subr
View File

@ -325,7 +325,7 @@ case "$cmd" in
;;
release-qc)
release_common
verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/Xonotic/gmqcc/gmqcc.linux64" XON_BUILDSYSTEM=1 clean all
verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
;;
release-buildpk3-transform-raw)

30
misc/tools/all/xonotic.subr
View File

@ -202,7 +202,21 @@ case "$cmd" in
verbose make $MAKEFLAGS
fi
if [ x"$USE_GMQCC" = x"yes" ]; then
if [ x"$USE_FTEQCC" = x"yes" ]; then
verbose cd "$d0/fteqcc"
if $cleanqcc; then
verbose make $MAKEFLAGS clean
fi
verbose make $MAKEFLAGS
verbose cd "$d0/data/xonotic-data.pk3dir"
if $cleanqc; then
verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
fi
verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
else
verbose cd "$d0/gmqcc"
if $cleanqcc; then
verbose make $MAKEFLAGS clean
@ -218,20 +232,6 @@ case "$cmd" in
verbose make QCC="../../../../gmqcc/qmqcc" "$@" $MAKEFLAGS clean
fi
verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS
else
verbose cd "$d0/fteqcc"
if $cleanqcc; then
verbose make $MAKEFLAGS clean
fi
verbose make $MAKEFLAGS
verbose cd "$d0/data/xonotic-data.pk3dir"
if $cleanqc; then
verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
fi
verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
#verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
fi
# 4 levels up: data, xonotic-data, qcsrc, server