basic fix after merge

Author: q4a

.gitignore

@@ -8,6 +8,7 @@ bin_plugs/
 intermediate/
 intermediate_plugs/
 lib/
+src/Externals/
 *.aps
 *.user
 *.PVS-Studio.*

Externals/NVTT/src/nvcore/Containers.h

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

Externals/NVTT/src/nvcore/Debug.cpp

@@ -1,7 +1,7 @@
 // This code is in the public domain -- [email protected]
 
-#include <Debug.h>
-#include <StrLib.h>
+#include <nvcore/Debug.h>
+#include <nvcore/StrLib.h>
 
 // Extern
 #if NV_OS_WIN32 //&& NV_CC_MSVC
@@ -28,8 +28,6 @@
 #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>

Externals/NVTT/src/nvcore/Debug.h

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

Externals/NVTT/src/nvcore/Library.h

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

Externals/NVTT/src/nvcore/Memory.h

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

Externals/NVTT/src/nvcore/Prefetch.h

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

Externals/NVTT/src/nvcore/Ptr.h

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

Externals/NVTT/src/nvcore/Radix.cpp

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

Externals/NVTT/src/nvcore/Radix.h

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