Fixed CMakeFiles, add cmake directory with Find*.cmake, add Linux bui…

…ld instructions

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "Externals/luajit"]
  path = Externals/luajit
- url = https://github.com/Xottab-DUTY/LuaJIT.git
+ url = https://github.com/vincent-t/LuaJIT.git
 [submodule "Externals/luabind"]
  path = Externals/luabind
  url = https://github.com/Xottab-DUTY/luabind-deboostified.git

CMakeLists.txt

@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 2.8.0)
+project(OpenXRay)
+
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++11")
+
+add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL)
+
+find_package(Lua51 REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(Theora REQUIRED)
+find_package(OGG REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(LZO REQUIRED)
+find_package(JPEG REQUIRED)
+
+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/cximage/CMakeLists.txt

@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 2.8.0)
+project(cximage)
+
+set(SOURCES
+ ximacfg.cpp
+ ximaenc.cpp
+ ximaexif.cpp
+ ximage.cpp
+ ximainfo.cpp
+ ximaint.cpp
+ ximajpg.cpp
+ ximalpha.cpp
+ ximalyr.cpp
+ ximapal.cpp
+ ximasel.cpp
+ ximath.cpp
+ xmemfile.cpp
+)
+
+set(HEADERS
+ xfile.h
+ ximacfg.h
+ ximadef.h
+ ximage.h
+ ximaiter.h
+ ximajpg.h
+ ximath.h
+ xiofile.h
+ xmemfile.h
+)
+
+add_definitions(-DCXIMAGE_BUILD)
+
+include_directories("." ${CMAKE_SOURCE_DIR})
+
+add_library(cximage STATIC ${SOURCES} ${HEADERS})
+
+set_target_properties(cximage PROPERTIES PREFIX "")
+target_link_libraries(cximage)

Externals/cximage/ximacfg.h

@@ -1,5 +1,8 @@
 #if !defined(__ximaCFG_h)
 #define __ximaCFG_h
+#if !defined(WIN32)
+#include <cstddef>
+#endif
 
 extern "C" void* cxalloc(size_t size);
 extern "C" void cxfree(void* ptr);

README.md

@@ -11,12 +11,16 @@ Changelist is available in [wiki](https://github.com/OpenXRay/xray-16/wiki/Chang
 
 Build instructions (Windows): [doc/howto/build.txt](doc/howto/build.txt)
 
-Build instructions (Linux):
-Dependencies (Ubuntu 18.04): sudo apt install git cmake lua5.1-dev libssl-dev libtheora-dev libogg-dev liblzo2-dev libjpeg-dev
-Init: git submodule update --init --recursive
-Building: mkdir bin && cd bin && cmake ../src
+Build instructions (Linux): [doc/howto/build-linux.txt](doc/howto/build-linux.txt)
 
 Current status (Linux):
+[ 66%] Building CXX object Externals/cximage/CMakeFiles/cximage.dir/ximaenc.cpp.o
+In file included from /home/1/xray-16/Externals/cximage/ximage.h:57:0,
+ from /home/1/xray-16/Externals/cximage/ximaenc.cpp:6:
+/home/1/xray-16/Externals/cximage/xiofile.h:21:12: error: ‘LPCTSTR’ has not been declared
+ bool Open(LPCTSTR filename, LPCTSTR mode)
+
+Old status (Linux):
 Build Failed:
 [ 82%] Building CXX object xrCore/CMakeFiles/xrCore.dir/clsid.cpp.o
 xray-16/src/xrCore/_types.h:14:24: error: expected initializer before ?s64?

cmake/FindLZO.cmake

@@ -0,0 +1,68 @@
+#https://raw.githubusercontent.com/dfelinto/blender/master/build_files/cmake/Modules/FindLZO.cmake
+# - Find LZO library
+# Find the native LZO includes and library
+# This module defines
+# LZO_INCLUDE_DIRS, where to find lzo1x.h, Set when
+# LZO_INCLUDE_DIR is found.
+# LZO_LIBRARIES, libraries to link against to use LZO.
+# LZO_ROOT_DIR, The base directory to search for LZO.
+# This can also be an environment variable.
+# LZO_FOUND, If false, do not try to use LZO.
+#
+# also defined, but not for general use are
+# LZO_LIBRARY, where to find the LZO library.
+
+#=============================================================================
+# Copyright 2015 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# If LZO_ROOT_DIR was defined in the environment, use it.
+IF(NOT LZO_ROOT_DIR AND NOT $ENV{LZO_ROOT_DIR} STREQUAL "")
+ SET(LZO_ROOT_DIR $ENV{LZO_ROOT_DIR})
+ENDIF()
+
+SET(_lzo_SEARCH_DIRS
+ ${LZO_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+)
+
+FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h
+ HINTS
+ ${_lzo_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include
+)
+
+FIND_LIBRARY(LZO_LIBRARY
+ NAMES
+ lzo2
+ HINTS
+ ${_lzo_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+
+# handle the QUIETLY and REQUIRED arguments and set LZO_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZO DEFAULT_MSG
+ LZO_LIBRARY LZO_INCLUDE_DIR)
+
+IF(LZO_FOUND)
+ SET(LZO_LIBRARIES ${LZO_LIBRARY})
+ SET(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR})
+ENDIF(LZO_FOUND)
+
+MARK_AS_ADVANCED(
+ LZO_INCLUDE_DIR
+ LZO_LIBRARY
+)

cmake/FindOGG.cmake

@@ -0,0 +1,106 @@
+#https://raw.githubusercontent.com/freeorion/freeorion/master/cmake/FindOgg.cmake
+#.rst:
+# FindOgg
+# -------
+#
+# Find the native Ogg includes and library.
+#
+# IMPORTED Targets
+# ^^^^^^^^^^^^^^^^
+#
+# This module defines :prop_tgt:`IMPORTED` target ``Ogg::Ogg``, if
+# Ogg has been found.
+#
+# Result Variables
+# ^^^^^^^^^^^^^^^^
+#
+# This module defines the following variables:
+#
+# ::
+#
+# OGG_INCLUDE_DIRS - where to find ogg.h, etc.
+# OGG_LIBRARIES - List of libraries when using ogg.
+# OGG_FOUND - True if ogg found.
+#
+# Hints
+# ^^^^^
+#
+# A user may set ``OGGDIR`` environment to a ogg installation root
+# to tell this module where to look.
+
+
+set(_OGG_SEARCHES)
+
+# Search OGGDIR first when is set.
+if(ENV{OGGDIR})
+ set(_OGG_SEARCH_ROOT PATHS $ENV{OGGDIR} NO_DEFAULT_PATH)
+ list(APPEND _OGG_SEARCHES _OGG_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_OGG_SEARCH_NORMAL
+ PATH ""
+ )
+list(APPEND _OGG_SEARCHES _OGG_SEARCH_NORMAL)
+
+set(OGG_NAMES ogg libogg)
+set(OGG_NAMES_DEBUG oggd ogg_D oggD ogg_D)
+
+foreach(search ${_OGG_SEARCHES})
+ find_path(OGG_INCLUDE_DIR NAMES ogg.h ${${search}} PATH_SUFFIXES ogg)
+endforeach()
+
+# Allow OGG_LIBRARY to be set manually, as the location of the
+# ogg library
+if(NOT OGG_LIBRARY)
+ foreach(search ${_OGG_SEARCHES})
+ find_library(OGG_LIBRARY_RELEASE NAMES ${OGG_NAMES} ${${search}} PATH_SUFFIXES lib)
+ find_library(OGG_LIBRARY_DEBUG NAMES ${OGG_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
+ endforeach()
+
+ include(SelectLibraryConfigurations)
+ select_library_configurations(OGG)
+endif()
+
+unset(OGG_NAMES)
+unset(OGG_NAMES_DEBUG)
+
+mark_as_advanced(OGG_LIBRARY OGG_INCLUDE_DIR)
+
+# handle the QUIETLY and REQUIRED argument and set OGG_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ogg REQUIRED_VARS OGG_LIBRARY OGG_INCLUDE_DIR)
+
+if(OGG_FOUND)
+ set(OGG_INCLUDE_DIRS ${OGG_INCLUDE_DIR})
+
+ if(NOT OGG_LIBRARIES)
+ set(OGG_LIBRARIES ${OGG_LIBRARY})
+ endif()
+
+ if(NOT TARGET Ogg::Ogg)
+ add_library(Ogg::Ogg UNKNOWN IMPORTED)
+ set_target_properties(Ogg::Ogg PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIRS}")
+
+ if(OGG_LIBRARY_RELEASE)
+ set_property(TARGET Ogg::Ogg APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(Ogg::Ogg PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${OGG_LIBRARY_RELEASE}")
+ endif()
+
+ if(OGG_LIBRARY_DEBUG)
+ set_property(TARGET Ogg::Ogg APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(Ogg::Ogg PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${OGG_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT OGG_LIBRARY_RELEASE AND NOT OGG_LIBRARY_DEBUG)
+ set_property(TARGET Ogg::Ogg APPEND PROPERTY
+ IMPORTED_LOCATION "${OGG_LIBRARY}")
+ endif()
+ endif()
+endif()