Merge remote branch 'origin/master' into samual/updatecommands

[xonotic/xonotic.git] / all

diff --git a/all b/all
index f69738a26ef7ab18a96fbd94df9ed2affba29c52..041969524ee46bc469ac18c12ebb61c8adcdbb36 100755 (executable)
--- a/all
+++ b/all
@@ -1788,7 +1788,7 @@ case "$cmd" in
                verbose "$SELF" update-maps
                ;;
        release-qc)
-               verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+               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 rm -f Xonotic/source/qcsrc/*/fteqcc.log
                ;;
        release-buildpk3-transform-raw)
@@ -1802,7 +1802,8 @@ case "$cmd" in
                verbose export jpeg_qual_rgb=97
                verbose export jpeg_qual_a=99
                verbose export do_dds=false
-               verbose export do_ogg=false
+               verbose export do_ogg=true
+               verbose export ogg_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
@@ -1818,6 +1819,7 @@ case "$cmd" in
                verbose export do_dds=true
                verbose export dds_flags=
                verbose export do_ogg=true
+               verbose export ogg_ogg=false
                verbose export del_src=true
                find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;