From a5c5d49fe8e24e20f7f9a9c613458ea30cb74d8d Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 17 Dec 2012 16:33:01 +0100 Subject: [PATCH] define both FTEQCC and QCC flags in make runs --- misc/tools/all/release.subr | 2 +- misc/tools/all/xonotic.subr | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr index e97bddb2..ca9ca181 100644 --- a/misc/tools/all/release.subr +++ b/misc/tools/all/release.subr @@ -324,7 +324,7 @@ case "$cmd" in ;; release-qc) release_common - verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$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/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log ;; release-buildpk3-transform-raw) diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index fc6a498d..00bdea5c 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -210,9 +210,11 @@ case "$cmd" in verbose cd "$d0/data/xonotic-data.pk3dir" if $cleanqc; then - verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean + verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean + #verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean fi - verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS + verbose make QCC="../../../../fteqcc/fteqcc.bin" FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS + #verbose make QCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS # 4 levels up: data, xonotic-data, qcsrc, server verbose cd "$d0/darkplaces" -- 2.39.2