X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fxonotic.subr;h=e1462c8bf9a4091a10f3ef008344c493e455c6b5;hp=6f66d62e76048a755f8ca3afe7e8e4ac1e08311f;hb=5c85d81e949435dcd8f683bfbcedb765d00c95d0;hpb=38843b816f00c0d1d1e0ce2d99f172a975eb7a3e 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"