X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcompress-texture;h=743992215a8af6548c0b1c99da307db88328360d;hp=0cafa5a2ea815e19dbf1f597e26517b743e39a87;hb=8f160b882942040edf23dd1adf3142c39d840d5c;hpb=0c0cb62b5ccdc329252de87f37b41a9a1eded916

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 0cafa5a2..74399221 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -3,6 +3,8 @@
 # usage: compress-texture tool compression in.png out.dds
 # example: compress-texture compressonator dxt1 foo.jpg foo.dds
 
+echo >&2 "$0 $*"
+
 tool=$1; shift
 format=$1; shift
 src=$1; shift
@@ -25,9 +27,16 @@ 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
-		mv "$dir/dst.dds" "$dst"
+
+		# compressonator and wine suck, so we sometimes have to retry :(
+		for retry in 1 2 3 4 5; do
+			wine "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
+			if mv "$dir/dst.dds" "$dst"; then
+				break
+			fi
+		done
 		rm -rf "$dir"
+		[ -f "$dst" ]
 		;;
 	nvcompress)
 		case "$format" in