RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-02-20 20:46:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compressonator usage

Browse Source
This commit is contained in:
Rudolf Polzer 2010-08-05 13:48:24 +02:00
parent 9c3bb7b447
commit 0981696b60
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all
View File

@ -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 &

10
misc/tools/cached-converter.sh
View File

@ -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()

2
misc/tools/compress-texture
View File

@ -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