NVTT Linux port

src/Externals/NVTT/CMakeLists.txt

@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8.0)
+project(nvtt)
+add_definitions(-DHAVE_SIGNAL_H -DHAVE_EXECINFO_H)
+add_subdirectory(src/nvcore)
+add_subdirectory(src/nvimage)
+add_subdirectory(src/nvmath)
+add_subdirectory(src/nvtt)

src/Externals/NVTT/src/nvcore/BitArray.h

@@ -3,8 +3,8 @@
 #ifndef NV_CORE_BITARRAY_H
 #define NV_CORE_BITARRAY_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Containers.h>
+#include <nvcore.h>
+#include <Containers.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvcore/CMakeLists.txt

@@ -23,7 +23,7 @@ SET(CORE_SRCS
 	Library.h
 	Library.cpp)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
 
 # targets
 ADD_DEFINITIONS(-DNVCORE_EXPORTS)

src/Externals/NVTT/src/nvcore/Containers.h

@@ -16,9 +16,9 @@ Do not use memmove in insert & remove, use copy ctors instead.
 
 
 // nvcore
-#include <nvcore/nvcore.h>
-#include <nvcore/Memory.h>
-#include <nvcore/Debug.h>
+#include <nvcore.h>
+#include <Memory.h>
+#include <Debug.h>
 
 #include <string.h>	// memmove
 #include <new>		// for placement new

src/Externals/NVTT/src/nvcore/Debug.cpp

@@ -1,7 +1,7 @@
 // This code is in the public domain -- [email protected]
 
-#include <nvcore/Debug.h>
-#include <nvcore/StrLib.h>
+#include <Debug.h>
+#include <StrLib.h>
 
 // Extern
 #if NV_OS_WIN32 //&& NV_CC_MSVC
@@ -28,6 +28,8 @@
 #endif
 
 #if NV_OS_LINUX && defined(HAVE_EXECINFO_H)
+#	include <sys/types.h>
+#	include <unistd.h> // getpid
 #	include <execinfo.h> // backtrace
 #	if NV_CC_GNUC // defined(HAVE_CXXABI_H)
 #		include <cxxabi.h>

src/Externals/NVTT/src/nvcore/Debug.h

@@ -3,7 +3,7 @@
 #ifndef NV_CORE_DEBUG_H
 #define NV_CORE_DEBUG_H
 
-#include <nvcore/nvcore.h>
+#include <nvcore.h>
 
 #if defined(HAVE_STDARG_H)
 #	include <stdarg.h>	// va_list

src/Externals/NVTT/src/nvcore/Library.h

@@ -3,7 +3,7 @@
 #ifndef NV_CORE_LIBRARY_H
 #define NV_CORE_LIBRARY_H
 
-#include <nvcore/nvcore.h>
+#include <nvcore.h>
 
 #if NV_OS_WIN32
 #define LIBRARY_NAME(name)	#name ".dll"

src/Externals/NVTT/src/nvcore/Memory.h

@@ -3,7 +3,7 @@
 #ifndef NV_CORE_MEMORY_H
 #define NV_CORE_MEMORY_H
 
-#include <nvcore/nvcore.h>
+#include <nvcore.h>
 
 #include <stdlib.h> // malloc(), realloc() and free()
 #include <stddef.h>	// size_t

src/Externals/NVTT/src/nvcore/Prefetch.h

@@ -3,7 +3,7 @@
 #ifndef NV_CORE_PREFETCH_H
 #define NV_CORE_PREFETCH_H
 
-#include <nvcore/nvcore.h>
+#include <nvcore.h>
 
 // nvPrefetch
 #if NV_CC_GNUC

src/Externals/NVTT/src/nvcore/Ptr.h

@@ -3,8 +3,8 @@
 #ifndef NV_CORE_PTR_H
 #define NV_CORE_PTR_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Debug.h>
+#include <nvcore.h>
+#include <Debug.h>
 
 #include <stdio.h>	// NULL
 

src/Externals/NVTT/src/nvcore/Radix.cpp

@@ -43,7 +43,7 @@ To do:
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Header
 
-#include <nvcore/Radix.h>
+#include <Radix.h>
 
 #include <string.h> // memset
 

src/Externals/NVTT/src/nvcore/Radix.h

@@ -12,7 +12,7 @@
 #ifndef NV_CORE_RADIXSORT_H
 #define NV_CORE_RADIXSORT_H
 
-#include <nvcore/nvcore.h>
+#include <nvcore.h>
 
 
 #define RADIX_LOCAL_RAM

src/Externals/NVTT/src/nvcore/StdStream.h

@@ -1,7 +1,7 @@
 #ifndef NV_STDSTREAM_H
 #define NV_STDSTREAM_H
 
-#include <nvcore/Stream.h>
+#include <Stream.h>
 
 #include <stdio.h> // fopen
 #include <string.h> // memcpy

src/Externals/NVTT/src/nvcore/StrLib.cpp

@@ -1,6 +1,6 @@
 // This code is in the public domain -- [email protected]
 
-#include <nvcore/StrLib.h>
+#include <StrLib.h>
 
 #include <math.h>	// log
 #include <stdio.h>	// vsnprintf

src/Externals/NVTT/src/nvcore/StrLib.h

@@ -3,8 +3,8 @@
 #ifndef NV_CORE_STRING_H
 #define NV_CORE_STRING_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Containers.h>	// swap
+#include <nvcore.h>
+#include <Containers.h>	// swap
 
 #include <string.h> // strlen, strcmp, etc.
 

src/Externals/NVTT/src/nvcore/Stream.h

@@ -3,8 +3,8 @@
 #ifndef NVCORE_STREAM_H
 #define NVCORE_STREAM_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Debug.h>
+#include <nvcore.h>
+#include <Debug.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvcore/TextReader.cpp

@@ -1,6 +1,6 @@
 // This code is in the public domain -- [email protected]
 
-#include <nvcore/TextReader.h>
+#include <TextReader.h>
 
 using namespace nv;
 

src/Externals/NVTT/src/nvcore/TextReader.h

@@ -3,9 +3,9 @@
 #ifndef NVCORE_TEXTREADER_H
 #define NVCORE_TEXTREADER_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Stream.h>
-#include <nvcore/Containers.h>
+#include <nvcore.h>
+#include <Stream.h>
+#include <Containers.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvcore/TextWriter.cpp

@@ -1,6 +1,6 @@
 // This code is in the public domain -- [email protected]
 
-#include <nvcore/TextWriter.h>
+#include <TextWriter.h>
 
 using namespace nv;
 

src/Externals/NVTT/src/nvcore/TextWriter.h

@@ -3,9 +3,9 @@
 #ifndef NVCORE_TEXTWRITER_H
 #define NVCORE_TEXTWRITER_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Stream.h>
-#include <nvcore/StrLib.h>
+#include <nvcore.h>
+#include <Stream.h>
+#include <StrLib.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvcore/Tokenizer.cpp

@@ -1,7 +1,7 @@
 // This code is in the public domain -- [email protected]
 
-#include <nvcore/Tokenizer.h>
-#include <nvcore/StrLib.h>
+#include <Tokenizer.h>
+#include <StrLib.h>
 
 #include <stdio.h> // vsscanf
 #include <stdarg.h>	// va_list

src/Externals/NVTT/src/nvcore/Tokenizer.h

@@ -3,10 +3,10 @@
 #ifndef NV_CORE_TOKENIZER_H
 #define NV_CORE_TOKENIZER_H
 
-#include <nvcore/nvcore.h>
-#include <nvcore/Stream.h>
-#include <nvcore/TextReader.h>
-#include <nvcore/StrLib.h>
+#include <nvcore.h>
+#include <Stream.h>
+#include <TextReader.h>
+#include <StrLib.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvimage/BlockDXT.cpp

@@ -21,7 +21,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/Stream.h>
+#include <Stream.h>
 
 #include "ColorBlock.h"
 #include "BlockDXT.h"

src/Externals/NVTT/src/nvimage/BlockDXT.h

@@ -24,9 +24,9 @@
 #ifndef NV_IMAGE_BLOCKDXT_H
 #define NV_IMAGE_BLOCKDXT_H
 
-#include <nvmath/Color.h>
+#include <Color.h>
 
-#include <nvimage/nvimage.h>
+#include <nvimage.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvimage/CMakeLists.txt

@@ -27,7 +27,7 @@ SET(IMAGE_SRCS
 	PsdFile.h
 	TgaFile.h)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include ${CMAKE_CURRENT_SOURCE_DIR}/../nvcore ${CMAKE_CURRENT_SOURCE_DIR}/../nvmath)
 
 IF(PNG_FOUND)
 	SET(LIBS ${LIBS} ${PNG_LIBRARIES})

src/Externals/NVTT/src/nvimage/ColorBlock.cpp

@@ -1,8 +1,8 @@
 // This code is in the public domain -- [email protected]
 
-#include <nvmath/Box.h>
-#include <nvimage/ColorBlock.h>
-#include <nvimage/Image.h>
+#include <Box.h>
+#include <ColorBlock.h>
+#include <Image.h>
 
 using namespace nv;
 

src/Externals/NVTT/src/nvimage/ColorBlock.h

@@ -3,7 +3,7 @@
 #ifndef NV_IMAGE_COLORBLOCK_H
 #define NV_IMAGE_COLORBLOCK_H
 
-#include <nvmath/Color.h>
+#include <Color.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvimage/ConeMap.cpp

@@ -21,14 +21,14 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/Ptr.h>
+#include <Ptr.h>
 
-#include <nvmath/Color.h>
+#include <Color.h>
 
-#include <nvimage/NormalMap.h>
-#include <nvimage/Filter.h>
-#include <nvimage/FloatImage.h>
-#include <nvimage/Image.h>
+#include <NormalMap.h>
+#include <Filter.h>
+#include <FloatImage.h>
+#include <Image.h>
 
 using namespace nv;
 

src/Externals/NVTT/src/nvimage/ConeMap.h

@@ -24,8 +24,8 @@
 #ifndef NV_IMAGE_CONEMAP_H
 #define NV_IMAGE_CONEMAP_H
 
-#include <nvmath/Vector.h>
-#include <nvimage/nvimage.h>
+#include <Vector.h>
+#include <nvimage.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvimage/DirectDrawSurface.cpp

@@ -21,15 +21,15 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/Debug.h>
-#include <nvcore/Containers.h> // max
-#include <nvcore/StdStream.h>
-
-#include <nvimage/DirectDrawSurface.h>
-#include <nvimage/ColorBlock.h>
-#include <nvimage/Image.h>
-#include <nvimage/BlockDXT.h>
-#include <nvimage/PixelFormat.h>
+#include <Debug.h>
+#include <Containers.h> // max
+#include <StdStream.h>
+
+#include <DirectDrawSurface.h>
+#include <ColorBlock.h>
+#include <Image.h>
+#include <BlockDXT.h>
+#include <PixelFormat.h>
 
 #include <string.h> // memset
 

src/Externals/NVTT/src/nvimage/DirectDrawSurface.h

@@ -24,7 +24,7 @@
 #ifndef NV_IMAGE_DIRECTDRAWSURFACE_H
 #define NV_IMAGE_DIRECTDRAWSURFACE_H
 
-#include <nvimage/nvimage.h>
+#include <nvimage.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvimage/Filter.cpp

@@ -35,8 +35,8 @@
 
 #include "Filter.h"
 
-#include <nvmath/Vector.h>	// Vector4
-#include <nvcore/Containers.h>	// swap
+#include <Vector.h>	// Vector4
+#include <Containers.h>	// swap
 
 using namespace nv;
 

src/Externals/NVTT/src/nvimage/Filter.h

@@ -3,8 +3,8 @@
 #ifndef NV_IMAGE_FILTER_H
 #define NV_IMAGE_FILTER_H
 
-#include <nvimage/nvimage.h>
-#include <nvcore/Debug.h>
+#include <nvimage.h>
+#include <Debug.h>
 
 namespace nv
 {

src/Externals/NVTT/src/nvimage/FloatImage.cpp

@@ -4,11 +4,11 @@
 #include "Filter.h"
 #include "Image.h"
 
-#include <nvmath/Color.h>
-#include <nvmath/Matrix.h>
+#include <Color.h>
+#include <Matrix.h>
 
-#include <nvcore/Containers.h>
-#include <nvcore/Ptr.h>
+#include <Containers.h>
+#include <Ptr.h>
 
 #include <math.h>