Skip to content

Commit a7d1f14

Browse files
committed
NVTT Linux port
1 parent 333ef6d commit a7d1f14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+274
-265
lines changed

src/Externals/NVTT/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
cmake_minimum_required(VERSION 2.8.0)
2+
project(nvtt)
3+
add_definitions(-DHAVE_SIGNAL_H -DHAVE_EXECINFO_H)
4+
add_subdirectory(src/nvcore)
5+
add_subdirectory(src/nvimage)
6+
add_subdirectory(src/nvmath)
7+
add_subdirectory(src/nvtt)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#ifndef NV_CORE_BITARRAY_H
44
#define NV_CORE_BITARRAY_H
55

6-
#include <nvcore/nvcore.h>
7-
#include <nvcore/Containers.h>
6+
#include <nvcore.h>
7+
#include <Containers.h>
88

99
namespace nv
1010
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SET(CORE_SRCS
2323
Library.h
2424
Library.cpp)
2525

26-
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
26+
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
2727

2828
# targets
2929
ADD_DEFINITIONS(-DNVCORE_EXPORTS)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Do not use memmove in insert & remove, use copy ctors instead.
1616

1717

1818
// nvcore
19-
#include <nvcore/nvcore.h>
20-
#include <nvcore/Memory.h>
21-
#include <nvcore/Debug.h>
19+
#include <nvcore.h>
20+
#include <Memory.h>
21+
#include <Debug.h>
2222

2323
#include <string.h> // memmove
2424
#include <new> // for placement new

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This code is in the public domain -- [email protected]
22

3-
#include <nvcore/Debug.h>
4-
#include <nvcore/StrLib.h>
3+
#include <Debug.h>
4+
#include <StrLib.h>
55

66
// Extern
77
#if NV_OS_WIN32 //&& NV_CC_MSVC
@@ -28,6 +28,8 @@
2828
#endif
2929

3030
#if NV_OS_LINUX && defined(HAVE_EXECINFO_H)
31+
# include <sys/types.h>
32+
# include <unistd.h> // getpid
3133
# include <execinfo.h> // backtrace
3234
# if NV_CC_GNUC // defined(HAVE_CXXABI_H)
3335
# include <cxxabi.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef NV_CORE_DEBUG_H
44
#define NV_CORE_DEBUG_H
55

6-
#include <nvcore/nvcore.h>
6+
#include <nvcore.h>
77

88
#if defined(HAVE_STDARG_H)
99
# include <stdarg.h> // va_list

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef NV_CORE_LIBRARY_H
44
#define NV_CORE_LIBRARY_H
55

6-
#include <nvcore/nvcore.h>
6+
#include <nvcore.h>
77

88
#if NV_OS_WIN32
99
#define LIBRARY_NAME(name) #name ".dll"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef NV_CORE_MEMORY_H
44
#define NV_CORE_MEMORY_H
55

6-
#include <nvcore/nvcore.h>
6+
#include <nvcore.h>
77

88
#include <stdlib.h> // malloc(), realloc() and free()
99
#include <stddef.h> // size_t

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef NV_CORE_PREFETCH_H
44
#define NV_CORE_PREFETCH_H
55

6-
#include <nvcore/nvcore.h>
6+
#include <nvcore.h>
77

88
// nvPrefetch
99
#if NV_CC_GNUC

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#ifndef NV_CORE_PTR_H
44
#define NV_CORE_PTR_H
55

6-
#include <nvcore/nvcore.h>
7-
#include <nvcore/Debug.h>
6+
#include <nvcore.h>
7+
#include <Debug.h>
88

99
#include <stdio.h> // NULL
1010

0 commit comments

Comments
 (0)