From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 5 Aug 2010 11:48:24 +0000 (+0200)
Subject: fix compressonator usage
X-Git-Tag: xonotic-v0.1.0preview~329^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0981696b606e360a7f39e21b0974ef5663a43435;p=xonotic%2Fxonotic.git

fix compressonator usage
---

diff --git a/all b/all
index cb8a09ef..3e176d20 100755
--- a/all
+++ b/all
@@ -956,7 +956,7 @@ case "$cmd" in
 		;;
 	release-engine)
 		"$SELF" release-engine-win32 &
-		# "$SELF" release-engine-win64 &
+		"$SELF" release-engine-win64 &
 		"$SELF" release-engine-osx &
 		"$SELF" release-engine-linux32 &
 		"$SELF" release-engine-linux64 &
diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 26b6ddf8..d53efb35 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -68,8 +68,8 @@ reduce_jpeg2_dds()
 	i=$1; shift
 	ia=$1; shift
 	o=$1; shift; shift 
-	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.png" && \
-	"$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.png" "$o" $1
+	convert "$i" "$ia" -compose CopyOpacity -composite "$tmpdir/x.tga" && \
+	"$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_jpeg2_jpeg2()
@@ -101,7 +101,8 @@ reduce_rgba_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	"$meprefix"compress-texture "$dds_tool" dxt5 "$i" "$o" $1
+	convert "$i" "$tmpdir/x.tga" && \
+	"$meprefix"compress-texture "$dds_tool" dxt5 "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_rgba_jpeg2()
@@ -119,7 +120,8 @@ reduce_rgb_dds()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
-	"$meprefix"compress-texture "$dds_tool" dxt1 "$i" "$o" $1
+	convert "$i" "$tmpdir/x.tga" && \
+	"$meprefix"compress-texture "$dds_tool" dxt1 "$tmpdir/x.tga" "$o" $1
 }
 
 reduce_rgb_jpeg()
diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 9e8d662b..199d9186 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