From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 26 Jun 2010 14:38:26 +0000 (+0200)
Subject: allow choosing between ATICompressor and DXTC.dll
X-Git-Tag: xonotic-v0.1.0preview~391^2~3
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=9c9343fa31358ad472b0e8d3a813eeee67b8e3a2

allow choosing between ATICompressor and DXTC.dll
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index e9a214b7..4d52563e 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -7,7 +7,7 @@ set -e
 : ${jpeg_qual_rgb:=95}
 : ${jpeg_qual_a:=99}
 : ${do_dds:=true}
-: ${dds_tool:=compressonator}
+: ${dds_tool:=compressonator-dxtc}
 : ${do_ogg:=false}
 : ${ogg_qual:=1}
 
diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index d1ceecd0..da050f96 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -8,9 +8,14 @@ format=$1; shift
 src=$1; shift
 dst=$1; shift
 
+c=
 f=
 case "$tool" in
-	compressonator)
+	compressonator-dxtc|compressor-atic)
+		case "$tool" in
+			*-dxtc) c="-codec DXTC.dll" ;;
+			*-atic) c="-codec ATICompressor.dll" ;;
+		esac
 		case "$format" in
 			dxt1) f="+fourCC DXT1" ;;
 			dxt3) f="+fourCC DXT3" ;;
@@ -21,7 +26,7 @@ case "$tool" in
 		dir_dos="C:/${dir##*/}"
 		ext=${src##*.}
 		cp "$src" "$dir/src.$ext"
-		wine "$HOME/.wine/drive_c/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" -codec DXTC.dll $f "$@"
+		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 "$@"
 		mv "$dir/dst.dds" "$dst"
 		rm -rf "$dir"
 		;;