From 5c85d81e949435dcd8f683bfbcedb765d00c95d0 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 19 Mar 2016 16:09:17 +1100 Subject: [PATCH] Fix MSYS2 xonotic-data.pk3dir/qcsrc rebuild detection --- misc/tools/all/xonotic.subr | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 6f66d62e..e1462c8b 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -249,11 +249,16 @@ case "$cmd" in verbose make $MAKEFLAGS gmqcc fi + if [ -n "$MSYSTEM" ]; then + DATAMAKE=mingw32-make + else + DATAMAKE=make + fi verbose cd "$d0/data/xonotic-data.pk3dir" if $cleanqc; then - verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean + verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS clean fi - verbose make QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS + verbose ${DATAMAKE} QCC="../../../../gmqcc/gmqcc" "$@" $MAKEFLAGS # 4 levels up: data, xonotic-data, qcsrc, server verbose cd "$d0/darkplaces" -- 2.39.2