clean up a bit (binary now renamed to s2tc_compress)

diff --git a/Makefile.am b/Makefile.am
index 46cf9e7..6223ced 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,13 @@
 ACLOCAL_AMFLAGS = -I m4
-bin_PROGRAMS = s2tc s2tc_decompress
-s2tc_SOURCES = s2tc.cpp
-s2tc_LDADD = libtxc_dxtn.la
+bin_PROGRAMS = s2tc_compress s2tc_decompress
+s2tc_compress_SOURCES = s2tc_compress.cpp
+s2tc_compress_LDADD = libtxc_dxtn.la
 s2tc_decompress_SOURCES = s2tc_decompress.cpp
 s2tc_decompress_LDADD = libtxc_dxtn.la
 
 lib_LTLIBRARIES = libtxc_dxtn.la
 
-libtxc_dxtn_la_SOURCES = s2tc_compressor.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_compressor.h txc_dxtn.h
+libtxc_dxtn_la_SOURCES = s2tc_algorithm.cpp s2tc_libtxc_dxtn.cpp s2tc_common.h s2tc_algorithm.h txc_dxtn.h
 libtxc_dxtn_la_LDFLAGS = -versioninfo 0:0:0
 libtxc_dxtn_la_LIBADD = -lm
 libtxc_dxtn_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement

diff --git a/s2tc_compressor.cpp b/s2tc_algorithm.cpp
similarity index 99%
rename from s2tc_compressor.cpp
rename to s2tc_algorithm.cpp
index 0da0dfb..3a0e7d2 100644 (file)
--- a/s2tc_compressor.cpp
+++ b/s2tc_algorithm.cpp
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "s2tc_compressor.h"
+#include "s2tc_algorithm.h"
 #include "s2tc_common.h"
 
 namespace

diff --git a/s2tc_compressor.h b/s2tc_algorithm.h
similarity index 100%
rename from s2tc_compressor.h
rename to s2tc_algorithm.h

diff --git a/s2tc.cpp b/s2tc_compress.cpp
similarity index 100%
rename from s2tc.cpp
rename to s2tc_compress.cpp

diff --git a/s2tc_libtxc_dxtn.cpp b/s2tc_libtxc_dxtn.cpp
index b9cdb8e..35dce98 100644 (file)
--- a/s2tc_libtxc_dxtn.cpp
+++ b/s2tc_libtxc_dxtn.cpp
@@ -6,7 +6,7 @@ extern "C"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "s2tc_compressor.h"
+#include "s2tc_algorithm.h"
 #include "s2tc_common.h"
 
 void fetch_2d_texel_rgb_dxt1(GLint srcRowStride, const GLubyte *pixdata,

diff --git a/tests/test.sh b/tests/test.sh
index a2bdc9d..b5743bf 100644 (file)
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -248,16 +248,16 @@ for i in dxtfail floor_tread01 floor_tread01_norm_dxt5 floor_tread01_norm_dxt3 f
                html "$i"-nvcompress.dds
        fi
 
-       S2TC_COLORDIST_MODE=$goodmetric S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-rand32-mrgb-l.dds bin/s2tc -t $fourcc
-       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-rand32-wavg-l.dds bin/s2tc -t $fourcc
-       S2TC_COLORDIST_MODE=AVG         S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-rand32-avg-l.dds  bin/s2tc -t $fourcc
+       S2TC_COLORDIST_MODE=$goodmetric S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-rand32-mrgb-l.dds bin/s2tc_compress -t $fourcc
+       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-rand32-wavg-l.dds bin/s2tc_compress -t $fourcc
+       S2TC_COLORDIST_MODE=AVG         S2TC_RANDOM_COLORS=32 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-rand32-avg-l.dds  bin/s2tc_compress -t $fourcc
        if $use_libtxc_dxtn; then
-               LD_PRELOAD=/usr/lib/libtxc_dxtn.so                                      t "$i".tga "$i"-libtxc_dxtn.dds   bin/s2tc -t $fourcc
+               LD_PRELOAD=/usr/lib/libtxc_dxtn.so                                      t "$i".tga "$i"-libtxc_dxtn.dds   bin/s2tc_compress -t $fourcc
                unset LD_PRELOAD
        fi
-       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=0  S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-norand-wavg-r.dds bin/s2tc -t $fourcc
-       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=-1 S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-faster-wavg-r.dds bin/s2tc -t $fourcc
-       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=-1 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-faster-wavg-l.dds bin/s2tc -t $fourcc
+       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=0  S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-norand-wavg-r.dds bin/s2tc_compress -t $fourcc
+       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=-1 S2TC_REFINE_COLORS=ALWAYS t "$i".tga "$i"-faster-wavg-r.dds bin/s2tc_compress -t $fourcc
+       S2TC_COLORDIST_MODE=WAVG        S2TC_RANDOM_COLORS=-1 S2TC_REFINE_COLORS=LOOP   t "$i".tga "$i"-faster-wavg-l.dds bin/s2tc_compress -t $fourcc
 
        html_rowend
 done