fix compressonator usage

diff --git a/all b/all
index cb8a09ef318142a0e21de89ab31813e5e1cff3d0..3e176d208271e21b35c72e51b54ea1b593545843 100755 (executable)
--- a/all
+++ b/all
@@ -956,7 +956,7 @@ case "$cmd" in
                ;;
        release-engine)
                "$SELF" release-engine-win32 &
                ;;
        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 &
                "$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 26b6ddf87e66f50138f7b9bfaed93e88290d5453..d53efb35b8f3a5dfd387befe8b42e0c0ae046a97 100755 (executable)
--- 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 
        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()
 }
 
 reduce_jpeg2_jpeg2()


@@ -101,7 +101,8 @@ reduce_rgba_dds()
 {
        i=$1; shift; shift
        o=$1; shift; shift
 {
        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()
 }
 
 reduce_rgba_jpeg2()


@@ -119,7 +120,8 @@ reduce_rgb_dds()
 {
        i=$1; shift; shift
        o=$1; shift; shift
 {
        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()
 }
 
 reduce_rgb_jpeg()

diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 9e8d662b30c50dee9e73f8c3b6e750c941664fba..199d9186a6dd633ac5a8886c2943ee11f0d0e944 100755 (executable)
--- 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
 
 # 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
 tool=$1; shift
 format=$1; shift
 src=$1; shift