Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:48:12 +0000 (11:48 -0500)
committerSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:48:12 +0000 (11:48 -0500)
all
misc/tools/cached-converter.sh

diff --git a/all b/all
index b451ac7d26f29254f61b9fddf260ce1511fe592b..041969524ee46bc469ac18c12ebb61c8adcdbb36 100755 (executable)
--- a/all
+++ b/all
@@ -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
                ;;
index aa4089c1273e42f1db5efa84ac899883a72bf2b1..ff69cbb5b96a4707d66efdf890e1e2314c96ba37 100755 (executable)
@@ -10,7 +10,8 @@ set -e
 : ${do_dds:=true}
 : ${dds_tool:=compressonator-dxtc}
 : ${do_ogg:=false}
-: ${ogg_qual:=1}
+: ${ogg_ogg:=true}
+: ${ogg_qual:=2}
 : ${del_src:=false}
 : ${git_src_repo:=}
 : ${dds_noalpha:=dxt1}
@@ -347,6 +348,11 @@ for F in "$@"; do
        will_jpeg=$do_jpeg
        will_dds=$do_dds
        will_ogg=$do_ogg
+       if ! $ogg_ogg; then
+               case "$f" in
+                       *.ogg) will_ogg=false ;;
+               esac
+       fi
        case "$f" in
                ./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
                *_bump) will_dds=false ;;