start X11 as compressonator needs it
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 5 Aug 2010 08:59:22 +0000 (10:59 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 5 Aug 2010 08:59:22 +0000 (10:59 +0200)
all
misc/tools/compress-texture

diff --git a/all b/all
index 7179a3bf71c8f1e2c28184900682d47585891835..afc203f140b6800154e87c06b73cc21e22a8ecdb 100755 (executable)
--- a/all
+++ b/all
@@ -1056,6 +1056,16 @@ case "$cmd" in
                "$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
                "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
                ;;
+       release-pack-needsx11)
+               case "$DISPLAY" in
+                       '')
+                               startx "$SELF" release-pack -- :7
+                               ;;
+                       *)
+                               "$SELF" release-pack
+                               ;;
+               esac
+               ;;
        release)
                "$SELF" release-prepare
                "$SELF" release-maps &
@@ -1063,7 +1073,7 @@ case "$cmd" in
                "$SELF" release-finish &
                "$SELF" release-qc &
                wait
-               "$SELF" release-pack
+               "$SELF" release-pack-needsx11
                ;;
 
        *)
index 0cafa5a2ea815e19dbf1f597e26517b743e39a87..9e8d662b30c50dee9e73f8c3b6e750c941664fba 100755 (executable)
@@ -25,7 +25,7 @@ case "$tool" in
                dir_dos="C:/${dir##*/}"
                ext=${src##*.}
                cp "$src" "$dir/src.$ext"
-               DISPLAY= wine "$HOME/.wine/drive_c/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" $c $f "$@" -mipper BoxFilter.dll
+               wine "$HOME/.wine/drive_c/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" $c $f "$@" -mipper BoxFilter.dll
                mv "$dir/dst.dds" "$dst"
                rm -rf "$dir"
                ;;