From e34a12a46f2a353f0b9c837f822b2c9013ead72d Mon Sep 17 00:00:00 2001 From: castano Date: Sun, 14 Oct 2007 08:58:24 +0000 Subject: [PATCH] flatten tree. --- src/CMakeLists.txt | 1 + src/nvimage/CMakeLists.txt | 2 -- src/{nvimage => }/nvtt/CMakeLists.txt | 0 src/{nvimage => }/nvtt/CompressDXT.cpp | 0 src/{nvimage => }/nvtt/CompressDXT.h | 0 src/{nvimage => }/nvtt/CompressRGB.cpp | 0 src/{nvimage => }/nvtt/CompressRGB.h | 0 src/{nvimage => }/nvtt/CompressionOptions.cpp | 0 src/{nvimage => }/nvtt/CompressionOptions.h | 0 src/{nvimage => }/nvtt/FastCompressDXT.cpp | 0 src/{nvimage => }/nvtt/FastCompressDXT.h | 0 src/{nvimage => }/nvtt/InputOptions.cpp | 0 src/{nvimage => }/nvtt/InputOptions.h | 0 src/{nvimage => }/nvtt/OutputOptions.cpp | 0 src/{nvimage => }/nvtt/QuickCompressDXT.cpp | 0 src/{nvimage => }/nvtt/QuickCompressDXT.h | 0 src/{nvimage => }/nvtt/cuda/CompressKernel.cu | 0 src/{nvimage => }/nvtt/cuda/ConvolveKernel.cu | 0 src/{nvimage => }/nvtt/cuda/CudaCompressDXT.cpp | 4 ++-- src/{nvimage => }/nvtt/cuda/CudaCompressDXT.h | 2 +- src/{nvimage => }/nvtt/cuda/CudaMath.h | 0 src/{nvimage => }/nvtt/cuda/CudaUtils.cpp | 0 src/{nvimage => }/nvtt/cuda/CudaUtils.h | 0 src/{nvimage => }/nvtt/dxtlib.cpp | 0 src/{nvimage => }/nvtt/nvtt.h | 0 src/{nvimage => }/nvtt/squish/CMakeLists.txt | 0 src/{nvimage => }/nvtt/squish/ChangeLog | 0 src/{nvimage => }/nvtt/squish/Doxyfile | 0 src/{nvimage => }/nvtt/squish/Makefile | 0 src/{nvimage => }/nvtt/squish/README | 0 src/{nvimage => }/nvtt/squish/alpha.cpp | 0 src/{nvimage => }/nvtt/squish/alpha.h | 0 src/{nvimage => }/nvtt/squish/clusterfit.cpp | 0 src/{nvimage => }/nvtt/squish/clusterfit.h | 0 src/{nvimage => }/nvtt/squish/colourblock.cpp | 0 src/{nvimage => }/nvtt/squish/colourblock.h | 0 src/{nvimage => }/nvtt/squish/colourfit.cpp | 0 src/{nvimage => }/nvtt/squish/colourfit.h | 0 src/{nvimage => }/nvtt/squish/colourset.cpp | 0 src/{nvimage => }/nvtt/squish/colourset.h | 0 src/{nvimage => }/nvtt/squish/config | 0 src/{nvimage => }/nvtt/squish/config.h | 0 src/{nvimage => }/nvtt/squish/extra/squishgen.cpp | 0 src/{nvimage => }/nvtt/squish/extra/squishpng.cpp | 0 src/{nvimage => }/nvtt/squish/extra/squishtest.cpp | 0 src/{nvimage => }/nvtt/squish/fastclusterfit.cpp | 0 src/{nvimage => }/nvtt/squish/fastclusterfit.h | 0 src/{nvimage => }/nvtt/squish/maths.cpp | 0 src/{nvimage => }/nvtt/squish/maths.h | 0 src/{nvimage => }/nvtt/squish/rangefit.cpp | 0 src/{nvimage => }/nvtt/squish/rangefit.h | 0 src/{nvimage => }/nvtt/squish/simd.h | 0 src/{nvimage => }/nvtt/squish/simd_sse.h | 0 src/{nvimage => }/nvtt/squish/simd_ve.h | 0 src/{nvimage => }/nvtt/squish/singlechannelfit.cpp | 0 src/{nvimage => }/nvtt/squish/singlechannelfit.h | 0 src/{nvimage => }/nvtt/squish/singlecolourfit.cpp | 0 src/{nvimage => }/nvtt/squish/singlecolourfit.h | 0 src/{nvimage => }/nvtt/squish/singlecolourlookup.inl | 0 src/{nvimage => }/nvtt/squish/squish.cpp | 0 src/{nvimage => }/nvtt/squish/squish.h | 0 .../nvtt/squish/squish.xcodeproj/project.pbxproj | 0 src/{nvimage => }/nvtt/squish/texture_compression_s3tc.txt | 0 src/{nvimage => }/nvtt/squish/vs7/squish.sln | 0 src/{nvimage => }/nvtt/squish/vs7/squish/squish.vcproj | 0 src/{nvimage => }/nvtt/squish/vs7/squishpng/squishpng.vcproj | 0 .../nvtt/squish/vs7/squishtest/squishtest.vcproj | 0 src/{nvimage => }/nvtt/squish/weightedclusterfit.cpp | 0 src/{nvimage => }/nvtt/squish/weightedclusterfit.h | 0 src/{nvimage => }/nvtt/tools/cmdline.h | 0 src/{nvimage => }/nvtt/tools/compress.cpp | 3 ++- src/{nvimage => }/nvtt/tools/configdialog.cpp | 0 src/{nvimage => }/nvtt/tools/configdialog.h | 0 src/{nvimage => }/nvtt/tools/configdialog.ui | 0 src/{nvimage => }/nvtt/tools/ddsinfo.cpp | 1 - src/{nvimage => }/nvtt/tools/decompress.cpp | 1 - src/{nvimage => }/nvtt/tools/imgdiff.cpp | 1 - 77 files changed, 6 insertions(+), 9 deletions(-) rename src/{nvimage => }/nvtt/CMakeLists.txt (100%) rename src/{nvimage => }/nvtt/CompressDXT.cpp (100%) rename src/{nvimage => }/nvtt/CompressDXT.h (100%) rename src/{nvimage => }/nvtt/CompressRGB.cpp (100%) rename src/{nvimage => }/nvtt/CompressRGB.h (100%) rename src/{nvimage => }/nvtt/CompressionOptions.cpp (100%) rename src/{nvimage => }/nvtt/CompressionOptions.h (100%) rename src/{nvimage => }/nvtt/FastCompressDXT.cpp (100%) rename src/{nvimage => }/nvtt/FastCompressDXT.h (100%) rename src/{nvimage => }/nvtt/InputOptions.cpp (100%) rename src/{nvimage => }/nvtt/InputOptions.h (100%) rename src/{nvimage => }/nvtt/OutputOptions.cpp (100%) rename src/{nvimage => }/nvtt/QuickCompressDXT.cpp (100%) rename src/{nvimage => }/nvtt/QuickCompressDXT.h (100%) rename src/{nvimage => }/nvtt/cuda/CompressKernel.cu (100%) rename src/{nvimage => }/nvtt/cuda/ConvolveKernel.cu (100%) rename src/{nvimage => }/nvtt/cuda/CudaCompressDXT.cpp (99%) rename src/{nvimage => }/nvtt/cuda/CudaCompressDXT.h (98%) rename src/{nvimage => }/nvtt/cuda/CudaMath.h (100%) rename src/{nvimage => }/nvtt/cuda/CudaUtils.cpp (100%) rename src/{nvimage => }/nvtt/cuda/CudaUtils.h (100%) rename src/{nvimage => }/nvtt/dxtlib.cpp (100%) rename src/{nvimage => }/nvtt/nvtt.h (100%) rename src/{nvimage => }/nvtt/squish/CMakeLists.txt (100%) rename src/{nvimage => }/nvtt/squish/ChangeLog (100%) rename src/{nvimage => }/nvtt/squish/Doxyfile (100%) rename src/{nvimage => }/nvtt/squish/Makefile (100%) rename src/{nvimage => }/nvtt/squish/README (100%) rename src/{nvimage => }/nvtt/squish/alpha.cpp (100%) rename src/{nvimage => }/nvtt/squish/alpha.h (100%) rename src/{nvimage => }/nvtt/squish/clusterfit.cpp (100%) rename src/{nvimage => }/nvtt/squish/clusterfit.h (100%) rename src/{nvimage => }/nvtt/squish/colourblock.cpp (100%) rename src/{nvimage => }/nvtt/squish/colourblock.h (100%) rename src/{nvimage => }/nvtt/squish/colourfit.cpp (100%) rename src/{nvimage => }/nvtt/squish/colourfit.h (100%) rename src/{nvimage => }/nvtt/squish/colourset.cpp (100%) rename src/{nvimage => }/nvtt/squish/colourset.h (100%) rename src/{nvimage => }/nvtt/squish/config (100%) rename src/{nvimage => }/nvtt/squish/config.h (100%) rename src/{nvimage => }/nvtt/squish/extra/squishgen.cpp (100%) rename src/{nvimage => }/nvtt/squish/extra/squishpng.cpp (100%) rename src/{nvimage => }/nvtt/squish/extra/squishtest.cpp (100%) rename src/{nvimage => }/nvtt/squish/fastclusterfit.cpp (100%) rename src/{nvimage => }/nvtt/squish/fastclusterfit.h (100%) rename src/{nvimage => }/nvtt/squish/maths.cpp (100%) rename src/{nvimage => }/nvtt/squish/maths.h (100%) rename src/{nvimage => }/nvtt/squish/rangefit.cpp (100%) rename src/{nvimage => }/nvtt/squish/rangefit.h (100%) rename src/{nvimage => }/nvtt/squish/simd.h (100%) rename src/{nvimage => }/nvtt/squish/simd_sse.h (100%) rename src/{nvimage => }/nvtt/squish/simd_ve.h (100%) rename src/{nvimage => }/nvtt/squish/singlechannelfit.cpp (100%) rename src/{nvimage => }/nvtt/squish/singlechannelfit.h (100%) rename src/{nvimage => }/nvtt/squish/singlecolourfit.cpp (100%) rename src/{nvimage => }/nvtt/squish/singlecolourfit.h (100%) rename src/{nvimage => }/nvtt/squish/singlecolourlookup.inl (100%) rename src/{nvimage => }/nvtt/squish/squish.cpp (100%) rename src/{nvimage => }/nvtt/squish/squish.h (100%) rename src/{nvimage => }/nvtt/squish/squish.xcodeproj/project.pbxproj (100%) rename src/{nvimage => }/nvtt/squish/texture_compression_s3tc.txt (100%) rename src/{nvimage => }/nvtt/squish/vs7/squish.sln (100%) rename src/{nvimage => }/nvtt/squish/vs7/squish/squish.vcproj (100%) rename src/{nvimage => }/nvtt/squish/vs7/squishpng/squishpng.vcproj (100%) rename src/{nvimage => }/nvtt/squish/vs7/squishtest/squishtest.vcproj (100%) rename src/{nvimage => }/nvtt/squish/weightedclusterfit.cpp (100%) rename src/{nvimage => }/nvtt/squish/weightedclusterfit.h (100%) rename src/{nvimage => }/nvtt/tools/cmdline.h (100%) rename src/{nvimage => }/nvtt/tools/compress.cpp (95%) rename src/{nvimage => }/nvtt/tools/configdialog.cpp (100%) rename src/{nvimage => }/nvtt/tools/configdialog.h (100%) rename src/{nvimage => }/nvtt/tools/configdialog.ui (100%) rename src/{nvimage => }/nvtt/tools/ddsinfo.cpp (95%) rename src/{nvimage => }/nvtt/tools/decompress.cpp (95%) rename src/{nvimage => }/nvtt/tools/imgdiff.cpp (95%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce3b4e1..5663e7f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,7 @@ SUBDIRS(nvcore) SUBDIRS(nvmath) SUBDIRS(nvimage) +SUBDIRS(nvtt) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/nvimage/CMakeLists.txt b/src/nvimage/CMakeLists.txt index 861016f..f3f487e 100644 --- a/src/nvimage/CMakeLists.txt +++ b/src/nvimage/CMakeLists.txt @@ -1,7 +1,5 @@ PROJECT(nvimage) -SUBDIRS(nvtt) - SET(IMAGE_SRCS nvimage.h FloatImage.h diff --git a/src/nvimage/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt similarity index 100% rename from src/nvimage/nvtt/CMakeLists.txt rename to src/nvtt/CMakeLists.txt diff --git a/src/nvimage/nvtt/CompressDXT.cpp b/src/nvtt/CompressDXT.cpp similarity index 100% rename from src/nvimage/nvtt/CompressDXT.cpp rename to src/nvtt/CompressDXT.cpp diff --git a/src/nvimage/nvtt/CompressDXT.h b/src/nvtt/CompressDXT.h similarity index 100% rename from src/nvimage/nvtt/CompressDXT.h rename to src/nvtt/CompressDXT.h diff --git a/src/nvimage/nvtt/CompressRGB.cpp b/src/nvtt/CompressRGB.cpp similarity index 100% rename from src/nvimage/nvtt/CompressRGB.cpp rename to src/nvtt/CompressRGB.cpp diff --git a/src/nvimage/nvtt/CompressRGB.h b/src/nvtt/CompressRGB.h similarity index 100% rename from src/nvimage/nvtt/CompressRGB.h rename to src/nvtt/CompressRGB.h diff --git a/src/nvimage/nvtt/CompressionOptions.cpp b/src/nvtt/CompressionOptions.cpp similarity index 100% rename from src/nvimage/nvtt/CompressionOptions.cpp rename to src/nvtt/CompressionOptions.cpp diff --git a/src/nvimage/nvtt/CompressionOptions.h b/src/nvtt/CompressionOptions.h similarity index 100% rename from src/nvimage/nvtt/CompressionOptions.h rename to src/nvtt/CompressionOptions.h diff --git a/src/nvimage/nvtt/FastCompressDXT.cpp b/src/nvtt/FastCompressDXT.cpp similarity index 100% rename from src/nvimage/nvtt/FastCompressDXT.cpp rename to src/nvtt/FastCompressDXT.cpp diff --git a/src/nvimage/nvtt/FastCompressDXT.h b/src/nvtt/FastCompressDXT.h similarity index 100% rename from src/nvimage/nvtt/FastCompressDXT.h rename to src/nvtt/FastCompressDXT.h diff --git a/src/nvimage/nvtt/InputOptions.cpp b/src/nvtt/InputOptions.cpp similarity index 100% rename from src/nvimage/nvtt/InputOptions.cpp rename to src/nvtt/InputOptions.cpp diff --git a/src/nvimage/nvtt/InputOptions.h b/src/nvtt/InputOptions.h similarity index 100% rename from src/nvimage/nvtt/InputOptions.h rename to src/nvtt/InputOptions.h diff --git a/src/nvimage/nvtt/OutputOptions.cpp b/src/nvtt/OutputOptions.cpp similarity index 100% rename from src/nvimage/nvtt/OutputOptions.cpp rename to src/nvtt/OutputOptions.cpp diff --git a/src/nvimage/nvtt/QuickCompressDXT.cpp b/src/nvtt/QuickCompressDXT.cpp similarity index 100% rename from src/nvimage/nvtt/QuickCompressDXT.cpp rename to src/nvtt/QuickCompressDXT.cpp diff --git a/src/nvimage/nvtt/QuickCompressDXT.h b/src/nvtt/QuickCompressDXT.h similarity index 100% rename from src/nvimage/nvtt/QuickCompressDXT.h rename to src/nvtt/QuickCompressDXT.h diff --git a/src/nvimage/nvtt/cuda/CompressKernel.cu b/src/nvtt/cuda/CompressKernel.cu similarity index 100% rename from src/nvimage/nvtt/cuda/CompressKernel.cu rename to src/nvtt/cuda/CompressKernel.cu diff --git a/src/nvimage/nvtt/cuda/ConvolveKernel.cu b/src/nvtt/cuda/ConvolveKernel.cu similarity index 100% rename from src/nvimage/nvtt/cuda/ConvolveKernel.cu rename to src/nvtt/cuda/ConvolveKernel.cu diff --git a/src/nvimage/nvtt/cuda/CudaCompressDXT.cpp b/src/nvtt/cuda/CudaCompressDXT.cpp similarity index 99% rename from src/nvimage/nvtt/cuda/CudaCompressDXT.cpp rename to src/nvtt/cuda/CudaCompressDXT.cpp index d652b1a..879289b 100644 --- a/src/nvimage/nvtt/cuda/CudaCompressDXT.cpp +++ b/src/nvtt/cuda/CudaCompressDXT.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include "CudaCompressDXT.h" #include "CudaUtils.h" diff --git a/src/nvimage/nvtt/cuda/CudaCompressDXT.h b/src/nvtt/cuda/CudaCompressDXT.h similarity index 98% rename from src/nvimage/nvtt/cuda/CudaCompressDXT.h rename to src/nvtt/cuda/CudaCompressDXT.h index b88cc5c..ed755f0 100644 --- a/src/nvimage/nvtt/cuda/CudaCompressDXT.h +++ b/src/nvtt/cuda/CudaCompressDXT.h @@ -25,7 +25,7 @@ #define NV_TT_CUDACOMPRESSDXT_H #include -#include +#include namespace nv { diff --git a/src/nvimage/nvtt/cuda/CudaMath.h b/src/nvtt/cuda/CudaMath.h similarity index 100% rename from src/nvimage/nvtt/cuda/CudaMath.h rename to src/nvtt/cuda/CudaMath.h diff --git a/src/nvimage/nvtt/cuda/CudaUtils.cpp b/src/nvtt/cuda/CudaUtils.cpp similarity index 100% rename from src/nvimage/nvtt/cuda/CudaUtils.cpp rename to src/nvtt/cuda/CudaUtils.cpp diff --git a/src/nvimage/nvtt/cuda/CudaUtils.h b/src/nvtt/cuda/CudaUtils.h similarity index 100% rename from src/nvimage/nvtt/cuda/CudaUtils.h rename to src/nvtt/cuda/CudaUtils.h diff --git a/src/nvimage/nvtt/dxtlib.cpp b/src/nvtt/dxtlib.cpp similarity index 100% rename from src/nvimage/nvtt/dxtlib.cpp rename to src/nvtt/dxtlib.cpp diff --git a/src/nvimage/nvtt/nvtt.h b/src/nvtt/nvtt.h similarity index 100% rename from src/nvimage/nvtt/nvtt.h rename to src/nvtt/nvtt.h diff --git a/src/nvimage/nvtt/squish/CMakeLists.txt b/src/nvtt/squish/CMakeLists.txt similarity index 100% rename from src/nvimage/nvtt/squish/CMakeLists.txt rename to src/nvtt/squish/CMakeLists.txt diff --git a/src/nvimage/nvtt/squish/ChangeLog b/src/nvtt/squish/ChangeLog similarity index 100% rename from src/nvimage/nvtt/squish/ChangeLog rename to src/nvtt/squish/ChangeLog diff --git a/src/nvimage/nvtt/squish/Doxyfile b/src/nvtt/squish/Doxyfile similarity index 100% rename from src/nvimage/nvtt/squish/Doxyfile rename to src/nvtt/squish/Doxyfile diff --git a/src/nvimage/nvtt/squish/Makefile b/src/nvtt/squish/Makefile similarity index 100% rename from src/nvimage/nvtt/squish/Makefile rename to src/nvtt/squish/Makefile diff --git a/src/nvimage/nvtt/squish/README b/src/nvtt/squish/README similarity index 100% rename from src/nvimage/nvtt/squish/README rename to src/nvtt/squish/README diff --git a/src/nvimage/nvtt/squish/alpha.cpp b/src/nvtt/squish/alpha.cpp similarity index 100% rename from src/nvimage/nvtt/squish/alpha.cpp rename to src/nvtt/squish/alpha.cpp diff --git a/src/nvimage/nvtt/squish/alpha.h b/src/nvtt/squish/alpha.h similarity index 100% rename from src/nvimage/nvtt/squish/alpha.h rename to src/nvtt/squish/alpha.h diff --git a/src/nvimage/nvtt/squish/clusterfit.cpp b/src/nvtt/squish/clusterfit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/clusterfit.cpp rename to src/nvtt/squish/clusterfit.cpp diff --git a/src/nvimage/nvtt/squish/clusterfit.h b/src/nvtt/squish/clusterfit.h similarity index 100% rename from src/nvimage/nvtt/squish/clusterfit.h rename to src/nvtt/squish/clusterfit.h diff --git a/src/nvimage/nvtt/squish/colourblock.cpp b/src/nvtt/squish/colourblock.cpp similarity index 100% rename from src/nvimage/nvtt/squish/colourblock.cpp rename to src/nvtt/squish/colourblock.cpp diff --git a/src/nvimage/nvtt/squish/colourblock.h b/src/nvtt/squish/colourblock.h similarity index 100% rename from src/nvimage/nvtt/squish/colourblock.h rename to src/nvtt/squish/colourblock.h diff --git a/src/nvimage/nvtt/squish/colourfit.cpp b/src/nvtt/squish/colourfit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/colourfit.cpp rename to src/nvtt/squish/colourfit.cpp diff --git a/src/nvimage/nvtt/squish/colourfit.h b/src/nvtt/squish/colourfit.h similarity index 100% rename from src/nvimage/nvtt/squish/colourfit.h rename to src/nvtt/squish/colourfit.h diff --git a/src/nvimage/nvtt/squish/colourset.cpp b/src/nvtt/squish/colourset.cpp similarity index 100% rename from src/nvimage/nvtt/squish/colourset.cpp rename to src/nvtt/squish/colourset.cpp diff --git a/src/nvimage/nvtt/squish/colourset.h b/src/nvtt/squish/colourset.h similarity index 100% rename from src/nvimage/nvtt/squish/colourset.h rename to src/nvtt/squish/colourset.h diff --git a/src/nvimage/nvtt/squish/config b/src/nvtt/squish/config similarity index 100% rename from src/nvimage/nvtt/squish/config rename to src/nvtt/squish/config diff --git a/src/nvimage/nvtt/squish/config.h b/src/nvtt/squish/config.h similarity index 100% rename from src/nvimage/nvtt/squish/config.h rename to src/nvtt/squish/config.h diff --git a/src/nvimage/nvtt/squish/extra/squishgen.cpp b/src/nvtt/squish/extra/squishgen.cpp similarity index 100% rename from src/nvimage/nvtt/squish/extra/squishgen.cpp rename to src/nvtt/squish/extra/squishgen.cpp diff --git a/src/nvimage/nvtt/squish/extra/squishpng.cpp b/src/nvtt/squish/extra/squishpng.cpp similarity index 100% rename from src/nvimage/nvtt/squish/extra/squishpng.cpp rename to src/nvtt/squish/extra/squishpng.cpp diff --git a/src/nvimage/nvtt/squish/extra/squishtest.cpp b/src/nvtt/squish/extra/squishtest.cpp similarity index 100% rename from src/nvimage/nvtt/squish/extra/squishtest.cpp rename to src/nvtt/squish/extra/squishtest.cpp diff --git a/src/nvimage/nvtt/squish/fastclusterfit.cpp b/src/nvtt/squish/fastclusterfit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/fastclusterfit.cpp rename to src/nvtt/squish/fastclusterfit.cpp diff --git a/src/nvimage/nvtt/squish/fastclusterfit.h b/src/nvtt/squish/fastclusterfit.h similarity index 100% rename from src/nvimage/nvtt/squish/fastclusterfit.h rename to src/nvtt/squish/fastclusterfit.h diff --git a/src/nvimage/nvtt/squish/maths.cpp b/src/nvtt/squish/maths.cpp similarity index 100% rename from src/nvimage/nvtt/squish/maths.cpp rename to src/nvtt/squish/maths.cpp diff --git a/src/nvimage/nvtt/squish/maths.h b/src/nvtt/squish/maths.h similarity index 100% rename from src/nvimage/nvtt/squish/maths.h rename to src/nvtt/squish/maths.h diff --git a/src/nvimage/nvtt/squish/rangefit.cpp b/src/nvtt/squish/rangefit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/rangefit.cpp rename to src/nvtt/squish/rangefit.cpp diff --git a/src/nvimage/nvtt/squish/rangefit.h b/src/nvtt/squish/rangefit.h similarity index 100% rename from src/nvimage/nvtt/squish/rangefit.h rename to src/nvtt/squish/rangefit.h diff --git a/src/nvimage/nvtt/squish/simd.h b/src/nvtt/squish/simd.h similarity index 100% rename from src/nvimage/nvtt/squish/simd.h rename to src/nvtt/squish/simd.h diff --git a/src/nvimage/nvtt/squish/simd_sse.h b/src/nvtt/squish/simd_sse.h similarity index 100% rename from src/nvimage/nvtt/squish/simd_sse.h rename to src/nvtt/squish/simd_sse.h diff --git a/src/nvimage/nvtt/squish/simd_ve.h b/src/nvtt/squish/simd_ve.h similarity index 100% rename from src/nvimage/nvtt/squish/simd_ve.h rename to src/nvtt/squish/simd_ve.h diff --git a/src/nvimage/nvtt/squish/singlechannelfit.cpp b/src/nvtt/squish/singlechannelfit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/singlechannelfit.cpp rename to src/nvtt/squish/singlechannelfit.cpp diff --git a/src/nvimage/nvtt/squish/singlechannelfit.h b/src/nvtt/squish/singlechannelfit.h similarity index 100% rename from src/nvimage/nvtt/squish/singlechannelfit.h rename to src/nvtt/squish/singlechannelfit.h diff --git a/src/nvimage/nvtt/squish/singlecolourfit.cpp b/src/nvtt/squish/singlecolourfit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/singlecolourfit.cpp rename to src/nvtt/squish/singlecolourfit.cpp diff --git a/src/nvimage/nvtt/squish/singlecolourfit.h b/src/nvtt/squish/singlecolourfit.h similarity index 100% rename from src/nvimage/nvtt/squish/singlecolourfit.h rename to src/nvtt/squish/singlecolourfit.h diff --git a/src/nvimage/nvtt/squish/singlecolourlookup.inl b/src/nvtt/squish/singlecolourlookup.inl similarity index 100% rename from src/nvimage/nvtt/squish/singlecolourlookup.inl rename to src/nvtt/squish/singlecolourlookup.inl diff --git a/src/nvimage/nvtt/squish/squish.cpp b/src/nvtt/squish/squish.cpp similarity index 100% rename from src/nvimage/nvtt/squish/squish.cpp rename to src/nvtt/squish/squish.cpp diff --git a/src/nvimage/nvtt/squish/squish.h b/src/nvtt/squish/squish.h similarity index 100% rename from src/nvimage/nvtt/squish/squish.h rename to src/nvtt/squish/squish.h diff --git a/src/nvimage/nvtt/squish/squish.xcodeproj/project.pbxproj b/src/nvtt/squish/squish.xcodeproj/project.pbxproj similarity index 100% rename from src/nvimage/nvtt/squish/squish.xcodeproj/project.pbxproj rename to src/nvtt/squish/squish.xcodeproj/project.pbxproj diff --git a/src/nvimage/nvtt/squish/texture_compression_s3tc.txt b/src/nvtt/squish/texture_compression_s3tc.txt similarity index 100% rename from src/nvimage/nvtt/squish/texture_compression_s3tc.txt rename to src/nvtt/squish/texture_compression_s3tc.txt diff --git a/src/nvimage/nvtt/squish/vs7/squish.sln b/src/nvtt/squish/vs7/squish.sln similarity index 100% rename from src/nvimage/nvtt/squish/vs7/squish.sln rename to src/nvtt/squish/vs7/squish.sln diff --git a/src/nvimage/nvtt/squish/vs7/squish/squish.vcproj b/src/nvtt/squish/vs7/squish/squish.vcproj similarity index 100% rename from src/nvimage/nvtt/squish/vs7/squish/squish.vcproj rename to src/nvtt/squish/vs7/squish/squish.vcproj diff --git a/src/nvimage/nvtt/squish/vs7/squishpng/squishpng.vcproj b/src/nvtt/squish/vs7/squishpng/squishpng.vcproj similarity index 100% rename from src/nvimage/nvtt/squish/vs7/squishpng/squishpng.vcproj rename to src/nvtt/squish/vs7/squishpng/squishpng.vcproj diff --git a/src/nvimage/nvtt/squish/vs7/squishtest/squishtest.vcproj b/src/nvtt/squish/vs7/squishtest/squishtest.vcproj similarity index 100% rename from src/nvimage/nvtt/squish/vs7/squishtest/squishtest.vcproj rename to src/nvtt/squish/vs7/squishtest/squishtest.vcproj diff --git a/src/nvimage/nvtt/squish/weightedclusterfit.cpp b/src/nvtt/squish/weightedclusterfit.cpp similarity index 100% rename from src/nvimage/nvtt/squish/weightedclusterfit.cpp rename to src/nvtt/squish/weightedclusterfit.cpp diff --git a/src/nvimage/nvtt/squish/weightedclusterfit.h b/src/nvtt/squish/weightedclusterfit.h similarity index 100% rename from src/nvimage/nvtt/squish/weightedclusterfit.h rename to src/nvtt/squish/weightedclusterfit.h diff --git a/src/nvimage/nvtt/tools/cmdline.h b/src/nvtt/tools/cmdline.h similarity index 100% rename from src/nvimage/nvtt/tools/cmdline.h rename to src/nvtt/tools/cmdline.h diff --git a/src/nvimage/nvtt/tools/compress.cpp b/src/nvtt/tools/compress.cpp similarity index 95% rename from src/nvimage/nvtt/tools/compress.cpp rename to src/nvtt/tools/compress.cpp index 08d6bec..e5659c8 100644 --- a/src/nvimage/nvtt/tools/compress.cpp +++ b/src/nvtt/tools/compress.cpp @@ -26,7 +26,8 @@ #include #include -#include + +#include #include "cmdline.h" diff --git a/src/nvimage/nvtt/tools/configdialog.cpp b/src/nvtt/tools/configdialog.cpp similarity index 100% rename from src/nvimage/nvtt/tools/configdialog.cpp rename to src/nvtt/tools/configdialog.cpp diff --git a/src/nvimage/nvtt/tools/configdialog.h b/src/nvtt/tools/configdialog.h similarity index 100% rename from src/nvimage/nvtt/tools/configdialog.h rename to src/nvtt/tools/configdialog.h diff --git a/src/nvimage/nvtt/tools/configdialog.ui b/src/nvtt/tools/configdialog.ui similarity index 100% rename from src/nvimage/nvtt/tools/configdialog.ui rename to src/nvtt/tools/configdialog.ui diff --git a/src/nvimage/nvtt/tools/ddsinfo.cpp b/src/nvtt/tools/ddsinfo.cpp similarity index 95% rename from src/nvimage/nvtt/tools/ddsinfo.cpp rename to src/nvtt/tools/ddsinfo.cpp index 6aab885..83a47c6 100644 --- a/src/nvimage/nvtt/tools/ddsinfo.cpp +++ b/src/nvtt/tools/ddsinfo.cpp @@ -26,7 +26,6 @@ #include #include -#include #include "cmdline.h" diff --git a/src/nvimage/nvtt/tools/decompress.cpp b/src/nvtt/tools/decompress.cpp similarity index 95% rename from src/nvimage/nvtt/tools/decompress.cpp rename to src/nvtt/tools/decompress.cpp index 597ce59..ffb2ceb 100644 --- a/src/nvimage/nvtt/tools/decompress.cpp +++ b/src/nvtt/tools/decompress.cpp @@ -26,7 +26,6 @@ #include #include -#include #include diff --git a/src/nvimage/nvtt/tools/imgdiff.cpp b/src/nvtt/tools/imgdiff.cpp similarity index 95% rename from src/nvimage/nvtt/tools/imgdiff.cpp rename to src/nvtt/tools/imgdiff.cpp index ab6e4ad..d4e3fef 100644 --- a/src/nvimage/nvtt/tools/imgdiff.cpp +++ b/src/nvtt/tools/imgdiff.cpp @@ -27,7 +27,6 @@ #include #include -#include #include