flatten tree.

17 years ago · e34a12a46f
parent b553bb11b8
commit e34a12a46f
77 changed files with 6 additions and 9 deletions
--- 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})

--- 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
--- a/src/nvimage/nvtt/CMakeLists.txt
+++ b/src/nvimage/nvtt/CMakeLists.txt
--- a/src/nvimage/nvtt/CompressDXT.cpp
+++ b/src/nvimage/nvtt/CompressDXT.cpp
--- a/src/nvimage/nvtt/CompressDXT.h
+++ b/src/nvimage/nvtt/CompressDXT.h
--- a/src/nvimage/nvtt/CompressRGB.cpp
+++ b/src/nvimage/nvtt/CompressRGB.cpp
--- a/src/nvimage/nvtt/CompressRGB.h
+++ b/src/nvimage/nvtt/CompressRGB.h
--- a/src/nvimage/nvtt/CompressionOptions.cpp
+++ b/src/nvimage/nvtt/CompressionOptions.cpp
--- a/src/nvimage/nvtt/CompressionOptions.h
+++ b/src/nvimage/nvtt/CompressionOptions.h
--- a/src/nvimage/nvtt/FastCompressDXT.cpp
+++ b/src/nvimage/nvtt/FastCompressDXT.cpp
--- a/src/nvimage/nvtt/FastCompressDXT.h
+++ b/src/nvimage/nvtt/FastCompressDXT.h
--- a/src/nvimage/nvtt/InputOptions.cpp
+++ b/src/nvimage/nvtt/InputOptions.cpp
--- a/src/nvimage/nvtt/InputOptions.h
+++ b/src/nvimage/nvtt/InputOptions.h
--- a/src/nvimage/nvtt/OutputOptions.cpp
+++ b/src/nvimage/nvtt/OutputOptions.cpp
--- a/src/nvimage/nvtt/QuickCompressDXT.cpp
+++ b/src/nvimage/nvtt/QuickCompressDXT.cpp
--- a/src/nvimage/nvtt/QuickCompressDXT.h
+++ b/src/nvimage/nvtt/QuickCompressDXT.h
--- a/src/nvimage/nvtt/cuda/CompressKernel.cu
+++ b/src/nvimage/nvtt/cuda/CompressKernel.cu
--- a/src/nvimage/nvtt/cuda/ConvolveKernel.cu
+++ b/src/nvimage/nvtt/cuda/ConvolveKernel.cu
--- a/src/nvimage/nvtt/cuda/CudaCompressDXT.cpp
+++ b/src/nvimage/nvtt/cuda/CudaCompressDXT.cpp
@ -28,8 +28,8 @@
 #include <nvimage/Image.h>
 #include <nvimage/ColorBlock.h>
 #include <nvimage/BlockDXT.h>
-#include <nvimage/nvtt/CompressionOptions.h>
-#include <nvimage/nvtt/FastCompressDXT.h>
+#include <nvtt/CompressionOptions.h>
+#include <nvtt/FastCompressDXT.h>

 #include "CudaCompressDXT.h"
 #include "CudaUtils.h"
--- a/src/nvimage/nvtt/cuda/CudaCompressDXT.h
+++ b/src/nvimage/nvtt/cuda/CudaCompressDXT.h
@ -25,7 +25,7 @@
 #define NV_TT_CUDACOMPRESSDXT_H

 #include <nvimage/nvimage.h>
-#include <nvimage/nvtt/nvtt.h>
+#include <nvtt/nvtt.h>

 namespace nv
 {
--- a/src/nvimage/nvtt/cuda/CudaMath.h
+++ b/src/nvimage/nvtt/cuda/CudaMath.h
--- a/src/nvimage/nvtt/cuda/CudaUtils.cpp
+++ b/src/nvimage/nvtt/cuda/CudaUtils.cpp
--- a/src/nvimage/nvtt/cuda/CudaUtils.h
+++ b/src/nvimage/nvtt/cuda/CudaUtils.h
--- a/src/nvimage/nvtt/dxtlib.cpp
+++ b/src/nvimage/nvtt/dxtlib.cpp
--- a/src/nvimage/nvtt/nvtt.h
+++ b/src/nvimage/nvtt/nvtt.h
--- a/src/nvimage/nvtt/squish/CMakeLists.txt
+++ b/src/nvimage/nvtt/squish/CMakeLists.txt
--- a/src/nvimage/nvtt/squish/ChangeLog
+++ b/src/nvimage/nvtt/squish/ChangeLog
--- a/src/nvimage/nvtt/squish/Doxyfile
+++ b/src/nvimage/nvtt/squish/Doxyfile
--- a/src/nvimage/nvtt/squish/Makefile
+++ b/src/nvimage/nvtt/squish/Makefile
--- a/src/nvimage/nvtt/squish/README
+++ b/src/nvimage/nvtt/squish/README
--- a/src/nvimage/nvtt/squish/alpha.cpp
+++ b/src/nvimage/nvtt/squish/alpha.cpp
--- a/src/nvimage/nvtt/squish/alpha.h
+++ b/src/nvimage/nvtt/squish/alpha.h
--- a/src/nvimage/nvtt/squish/clusterfit.cpp
+++ b/src/nvimage/nvtt/squish/clusterfit.cpp
--- a/src/nvimage/nvtt/squish/clusterfit.h
+++ b/src/nvimage/nvtt/squish/clusterfit.h
--- a/src/nvimage/nvtt/squish/colourblock.cpp
+++ b/src/nvimage/nvtt/squish/colourblock.cpp
--- a/src/nvimage/nvtt/squish/colourblock.h
+++ b/src/nvimage/nvtt/squish/colourblock.h
--- a/src/nvimage/nvtt/squish/colourfit.cpp
+++ b/src/nvimage/nvtt/squish/colourfit.cpp
--- a/src/nvimage/nvtt/squish/colourfit.h
+++ b/src/nvimage/nvtt/squish/colourfit.h
--- a/src/nvimage/nvtt/squish/colourset.cpp
+++ b/src/nvimage/nvtt/squish/colourset.cpp
--- a/src/nvimage/nvtt/squish/colourset.h
+++ b/src/nvimage/nvtt/squish/colourset.h
--- a/src/nvimage/nvtt/squish/config
+++ b/src/nvimage/nvtt/squish/config
--- a/src/nvimage/nvtt/squish/config.h
+++ b/src/nvimage/nvtt/squish/config.h
--- a/src/nvimage/nvtt/squish/extra/squishgen.cpp
+++ b/src/nvimage/nvtt/squish/extra/squishgen.cpp
--- a/src/nvimage/nvtt/squish/extra/squishpng.cpp
+++ b/src/nvimage/nvtt/squish/extra/squishpng.cpp
--- a/src/nvimage/nvtt/squish/extra/squishtest.cpp
+++ b/src/nvimage/nvtt/squish/extra/squishtest.cpp
--- a/src/nvimage/nvtt/squish/fastclusterfit.cpp
+++ b/src/nvimage/nvtt/squish/fastclusterfit.cpp
--- a/src/nvimage/nvtt/squish/fastclusterfit.h
+++ b/src/nvimage/nvtt/squish/fastclusterfit.h
--- a/src/nvimage/nvtt/squish/maths.cpp
+++ b/src/nvimage/nvtt/squish/maths.cpp
--- a/src/nvimage/nvtt/squish/maths.h
+++ b/src/nvimage/nvtt/squish/maths.h
--- a/src/nvimage/nvtt/squish/rangefit.cpp
+++ b/src/nvimage/nvtt/squish/rangefit.cpp
--- a/src/nvimage/nvtt/squish/rangefit.h
+++ b/src/nvimage/nvtt/squish/rangefit.h
--- a/src/nvimage/nvtt/squish/simd.h
+++ b/src/nvimage/nvtt/squish/simd.h
--- a/src/nvimage/nvtt/squish/simd_sse.h
+++ b/src/nvimage/nvtt/squish/simd_sse.h
--- a/src/nvimage/nvtt/squish/simd_ve.h
+++ b/src/nvimage/nvtt/squish/simd_ve.h
--- a/src/nvimage/nvtt/squish/singlechannelfit.cpp
+++ b/src/nvimage/nvtt/squish/singlechannelfit.cpp
--- a/src/nvimage/nvtt/squish/singlechannelfit.h
+++ b/src/nvimage/nvtt/squish/singlechannelfit.h
--- a/src/nvimage/nvtt/squish/singlecolourfit.cpp
+++ b/src/nvimage/nvtt/squish/singlecolourfit.cpp
--- a/src/nvimage/nvtt/squish/singlecolourfit.h
+++ b/src/nvimage/nvtt/squish/singlecolourfit.h
--- a/src/nvimage/nvtt/squish/singlecolourlookup.inl
+++ b/src/nvimage/nvtt/squish/singlecolourlookup.inl
--- a/src/nvimage/nvtt/squish/squish.cpp
+++ b/src/nvimage/nvtt/squish/squish.cpp
--- a/src/nvimage/nvtt/squish/squish.h
+++ b/src/nvimage/nvtt/squish/squish.h
--- a/src/nvimage/nvtt/squish/squish.xcodeproj/project.pbxproj
+++ b/src/nvimage/nvtt/squish/squish.xcodeproj/project.pbxproj
--- a/src/nvimage/nvtt/squish/texture_compression_s3tc.txt
+++ b/src/nvimage/nvtt/squish/texture_compression_s3tc.txt
--- a/src/nvimage/nvtt/squish/vs7/squish.sln
+++ b/src/nvimage/nvtt/squish/vs7/squish.sln
--- a/src/nvimage/nvtt/squish/vs7/squish/squish.vcproj
+++ b/src/nvimage/nvtt/squish/vs7/squish/squish.vcproj
--- a/src/nvimage/nvtt/squish/vs7/squishpng/squishpng.vcproj
+++ b/src/nvimage/nvtt/squish/vs7/squishpng/squishpng.vcproj
--- a/src/nvimage/nvtt/squish/vs7/squishtest/squishtest.vcproj
+++ b/src/nvimage/nvtt/squish/vs7/squishtest/squishtest.vcproj
--- a/src/nvimage/nvtt/squish/weightedclusterfit.cpp
+++ b/src/nvimage/nvtt/squish/weightedclusterfit.cpp
--- a/src/nvimage/nvtt/squish/weightedclusterfit.h
+++ b/src/nvimage/nvtt/squish/weightedclusterfit.h
--- a/src/nvimage/nvtt/tools/cmdline.h
+++ b/src/nvimage/nvtt/tools/cmdline.h
--- a/src/nvimage/nvtt/tools/compress.cpp
+++ b/src/nvimage/nvtt/tools/compress.cpp
@ -26,7 +26,8 @@

 #include <nvimage/Image.h>
 #include <nvimage/DirectDrawSurface.h>
-#include <nvimage/nvtt/nvtt.h>
+
+#include <nvtt/nvtt.h>

 #include "cmdline.h"

--- a/src/nvimage/nvtt/tools/configdialog.cpp
+++ b/src/nvimage/nvtt/tools/configdialog.cpp
--- a/src/nvimage/nvtt/tools/configdialog.h
+++ b/src/nvimage/nvtt/tools/configdialog.h
--- a/src/nvimage/nvtt/tools/configdialog.ui
+++ b/src/nvimage/nvtt/tools/configdialog.ui
--- a/src/nvimage/nvtt/tools/ddsinfo.cpp
+++ b/src/nvimage/nvtt/tools/ddsinfo.cpp
@ -26,7 +26,6 @@

 #include <nvimage/Image.h>
 #include <nvimage/DirectDrawSurface.h>
-#include <nvimage/nvtt/nvtt.h>

 #include "cmdline.h"

--- a/src/nvimage/nvtt/tools/decompress.cpp
+++ b/src/nvimage/nvtt/tools/decompress.cpp
@ -26,7 +26,6 @@

 #include <nvimage/Image.h>
 #include <nvimage/DirectDrawSurface.h>
-#include <nvimage/nvtt/nvtt.h>

 #include <nvimage/ImageIO.h>

--- a/src/nvimage/nvtt/tools/imgdiff.cpp
+++ b/src/nvimage/nvtt/tools/imgdiff.cpp
@ -27,7 +27,6 @@

 #include <nvimage/Image.h>
 #include <nvimage/DirectDrawSurface.h>
-#include <nvimage/nvtt/nvtt.h>

 #include <nvmath/Color.h>