Update CMakeLists and some code for building on Linux

Author: q4a

CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 2.8.0)
+project(OpenXRay)
+
+include(${PROJECT_SOURCE_DIR}/cmake/utils.cmake)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17")
+
+add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)
+
+set(LUA_INCLUDE_DIR Externals/luajit/src)
+set(LUA_LIBRARIES luajit)
+set(LUA_FOUND 1)
+if (NOT WIN32)
+find_package(OpenSSL REQUIRED)
+find_package(Theora REQUIRED)
+find_package(OGG REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(LZO REQUIRED)
+find_package(JPEG REQUIRED)
+endif()
+
+include_directories(${LUA_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR} {CMAKE_SOURCE_DIR}/Common ${CMAKE_SOURCE_DIR}/Externals ${CMAKE_SOURCE_DIR}/Externals/gli/external/glm ${CMAKE_SOURCE_DIR}/../sdk/include/loki)
+
+add_subdirectory(Externals)
+add_subdirectory(src)

Externals/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_subdirectory(luajit)
+add_subdirectory(luabind)
+add_subdirectory(lzo)
+add_subdirectory(cximage)
+add_subdirectory(NVTT)
+#add_subdirectory(gli)
+#add_subdirectory(glew)

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)

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}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
 
 # targets
 ADD_DEFINITIONS(-DNVCORE_EXPORTS)

Externals/NVTT/src/nvcore/Debug.cpp

@@ -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>

Externals/NVTT/src/nvcore/Debug.h

@@ -30,6 +30,19 @@
 
 #else // NV_NO_ASSERT
 
+#   if NV_CC_MSVC
+        // @@ Does this work in msvc-6 and earlier?
+#       define nvDebugBreak()       __debugbreak()
+//#       define nvDebugBreak()        __asm { int 3 }
+#   elif NV_OS_ORBIS
+#       define nvDebugBreak()       __debugbreak()
+#   elif NV_CC_GNUC
+#       define nvDebugBreak()       __builtin_trap()
+#   else
+#       error "No nvDebugBreak()!"
+#   endif
+
+/*
 #	if NV_CC_MSVC
 		// @@ Does this work in msvc-6 and earlier?
 		// @@ Do I have to include <intrin.h> ?
@@ -39,13 +52,14 @@
 #		define nvDebugBreak()		__asm__ volatile ("trap");
 #	elif NV_CC_GNUC && NV_CPU_X86 && NV_OS_DARWIN
 #		define nvDebugBreak()		__asm__ volatile ("int3");
-#	elif NV_CC_GNUC && NV_CPU_X86 
+#	elif NV_CC_GNUC && NV_CPU_X86
 #		define nvDebugBreak()		__asm__ ( "int %0" : :"I"(3) )
 #	else
 #		include <signal.h>
 #		define nvDebugBreak()		raise(SIGTRAP); 
 		// define nvDebugBreak() 		*((int *)(0)) = 0
 #	endif
+*/
 
 #	define nvAssertMacro(exp) \
 		do { \

Externals/NVTT/src/nvimage/CMakeLists.txt

@@ -1,6 +1,6 @@
 PROJECT(nvimage)
 
-SET(IMAGE_SRCS	
+SET(IMAGE_SRCS
 	nvimage.h
 	FloatImage.h
 	FloatImage.cpp
@@ -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}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
 
 IF(PNG_FOUND)
 	SET(LIBS ${LIBS} ${PNG_LIBRARIES})

Externals/NVTT/src/nvimage/ImageIO.cpp

@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(const char * fileName)
 	StdInputStream stream(fileName);
 
 	if (stream.isError()) {
-		return false;
+		return NULL;
 	}
 
 	return loadFloat(fileName, stream);
@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
 		case TGA_TYPE_INDEXED:
 			if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
 				nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
-				return false;
+				return NULL;
 			}
 			pal = true;
 			break;
@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
 
 		default:
 			nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
-			return false;
+			return NULL;
 	}
 
 	const uint pixel_size = (tga.pixel_size/8);

Externals/NVTT/src/nvmath/CMakeLists.txt

@@ -13,7 +13,7 @@ SET(MATH_SRCS
 	Basis.h Basis.cpp
 	Triangle.h Triangle.cpp TriBox.cpp)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
 
 # targets
 ADD_DEFINITIONS(-DNVMATH_EXPORTS)

Externals/NVTT/src/nvmath/TriBox.cpp

@@ -1,6 +1,6 @@
 /********************************************************/
 /* AABB-triangle overlap test code                      */
-/* by Tomas Akenine-Möller                              */
+/* by Tomas Akenine-Möller                              */
 /* Function: int triBoxOverlap(float boxcenter[3],      */
 /*          float boxhalfsize[3],float triverts[3][3]); */
 /* History:                                             */