Skip to content

Commit

Permalink
Merge branch '0.2-Dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
DieSlower committed Feb 10, 2021
2 parents 873d916 + 84d9d02 commit 05126ce
Show file tree
Hide file tree
Showing 337 changed files with 1,198 additions and 1,194 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
160 changes: 80 additions & 80 deletions CMakeModules/FindBoostLibs.cmake
Original file line number Diff line number Diff line change
@@ -1,81 +1,81 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Maxim Serebrennik

# *****************************************************************************
# *****************************************************************************
# FindBoostLibs uses CMakes FindBoost to find specific boost libraries ********
# *****************************************************************************
# All search options and Boost configurations should be placed here ***********
# *****************************************************************************
# *****************************************************************************

# This module finds headers and requested component libraries OR a CMake
# package configuration file provided by a "Boost CMake" build. For the
# latter case skip to the "Boost CMake" section below. For the former
# case results are reported in variables::
#
# BoostLibs_FOUND - True if headers and requested libraries were found
# Boost_FOUND - True if headers and requested libraries were found
# Boost_INCLUDE_DIRS - Boost include directories
# Boost_LIBRARY_DIRS - Link directories for Boost libraries
# Boost_LIBRARIES - Boost component libraries to be linked
# Boost_<C>_FOUND - True if component <C> was found (<C> is upper-case)
# Boost_<C>_LIBRARY - Libraries to link for component <C> (may include
# target_link_libraries debug/optimized keywords)
# Boost_VERSION - BOOST_VERSION value from boost/version.hpp
# Boost_LIB_VERSION - Version string appended to library filenames
# Boost_MAJOR_VERSION - Boost major version number (X in X.y.z)
# Boost_MINOR_VERSION - Boost minor version number (Y in x.Y.z)
# Boost_SUBMINOR_VERSION - Boost subminor version number (Z in x.y.Z)
# Boost_LIB_DIAGNOSTIC_DEFINITIONS (Windows)
# - Pass to add_definitions() to have diagnostic
# information about Boost's automatic linking
# displayed during compilation
#
# This module reads hints about search locations from variables::
#
# BOOST_ROOT - Preferred installation prefix
# (or BOOSTROOT)
# BOOST_INCLUDEDIR - Preferred include directory e.g. <prefix>/include
# BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib
# Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not
# specified by these hint variables. Default is OFF.
# Boost_ADDITIONAL_VERSIONS
# - List of Boost versions not known to this module
# (Boost install locations may contain the version)
#
# and saves search results persistently in CMake cache entries::
#
# Boost_INCLUDE_DIR - Directory containing Boost headers
# Boost_LIBRARY_DIR_RELEASE - Directory containing release Boost libraries
# Boost_LIBRARY_DIR_DEBUG - Directory containing debug Boost libraries
# Boost_<C>_LIBRARY_DEBUG - Component <C> library debug variant
# Boost_<C>_LIBRARY_RELEASE - Component <C> library release variant

SET (DEPENDENCY "BoostLibs")

FIND_PACKAGE (Boost ${BoostLibs_FIND_VERSION} REQUIRED )

SET (${DEPENDENCY}_FOUND "NO")
IF (Boost_FOUND)
SET (${DEPENDENCY}_FOUND "YES")
ENDIF ()
# *****************************************************************************
# *****************************************************************************
# True Reality Open Source Game and Simulation Engine
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Maxim Serebrennik

# *****************************************************************************
# *****************************************************************************
# FindBoostLibs uses CMakes FindBoost to find specific boost libraries ********
# *****************************************************************************
# All search options and Boost configurations should be placed here ***********
# *****************************************************************************
# *****************************************************************************

# This module finds headers and requested component libraries OR a CMake
# package configuration file provided by a "Boost CMake" build. For the
# latter case skip to the "Boost CMake" section below. For the former
# case results are reported in variables::
#
# BoostLibs_FOUND - True if headers and requested libraries were found
# Boost_FOUND - True if headers and requested libraries were found
# Boost_INCLUDE_DIRS - Boost include directories
# Boost_LIBRARY_DIRS - Link directories for Boost libraries
# Boost_LIBRARIES - Boost component libraries to be linked
# Boost_<C>_FOUND - True if component <C> was found (<C> is upper-case)
# Boost_<C>_LIBRARY - Libraries to link for component <C> (may include
# target_link_libraries debug/optimized keywords)
# Boost_VERSION - BOOST_VERSION value from boost/version.hpp
# Boost_LIB_VERSION - Version string appended to library filenames
# Boost_MAJOR_VERSION - Boost major version number (X in X.y.z)
# Boost_MINOR_VERSION - Boost minor version number (Y in x.Y.z)
# Boost_SUBMINOR_VERSION - Boost subminor version number (Z in x.y.Z)
# Boost_LIB_DIAGNOSTIC_DEFINITIONS (Windows)
# - Pass to add_definitions() to have diagnostic
# information about Boost's automatic linking
# displayed during compilation
#
# This module reads hints about search locations from variables::
#
# BOOST_ROOT - Preferred installation prefix
# (or BOOSTROOT)
# BOOST_INCLUDEDIR - Preferred include directory e.g. <prefix>/include
# BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib
# Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not
# specified by these hint variables. Default is OFF.
# Boost_ADDITIONAL_VERSIONS
# - List of Boost versions not known to this module
# (Boost install locations may contain the version)
#
# and saves search results persistently in CMake cache entries::
#
# Boost_INCLUDE_DIR - Directory containing Boost headers
# Boost_LIBRARY_DIR_RELEASE - Directory containing release Boost libraries
# Boost_LIBRARY_DIR_DEBUG - Directory containing debug Boost libraries
# Boost_<C>_LIBRARY_DEBUG - Component <C> library debug variant
# Boost_<C>_LIBRARY_RELEASE - Component <C> library release variant

SET (DEPENDENCY "BoostLibs")

FIND_PACKAGE (Boost ${BoostLibs_FIND_VERSION} REQUIRED )

SET (${DEPENDENCY}_FOUND "NO")
IF (Boost_FOUND)
SET (${DEPENDENCY}_FOUND "YES")
ENDIF ()
# *****************************************************************************
# *****************************************************************************
# *****************************************************************************
2 changes: 1 addition & 1 deletion CMakeModules/FindFFMPEG.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/FindGoogleTest.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/FindJsonCpp.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright � 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/FindOSG.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/FindOpenThreads.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
108 changes: 54 additions & 54 deletions CMakeModules/FindbID.cmake
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Maxim Serebrennik

# ********************************************************************************
# Finds the bID headers, which are the boost UUID extracted header files. ********
# ********************************************************************************
# ********************************************************************************
# Creates and sets variables to use through out cmake ****************************
# bID_INCLUDE_DIR - Holds the path to the bID Headers ****************************
# ********************************************************************************
# bID_FOUND - Defined if the dependency is found *********************************
# ********************************************************************************

SET (DEPENDENCY "bID")

# Finds the include files necessary for compilation
FIND_PATH (${DEPENDENCY}_INCLUDE_DIR bID/version.hpp
HINTS
$ENV{bID_INC}
$ENV{bID_ROOT}/include
$ENV{bID_ROOT}/inc
$ENV{bID_ROOT}
$ENV{TR_INC}
$ENV{TR_ROOT}/Ext/include
$ENV{TR_ROOT}/Ext
$ENV{TR_ROOT}/include
$ENV{TR_ROOT}
PATHS
/usr/include
/usr/local/include
~/Library/Frameworks
/Library/Frameworks
)
MARK_AS_ADVANCED (${DEPENDENCY}_INCLUDE_DIR)

SET (${DEPENDENCY}_FOUND "NO")
IF (${DEPENDENCY}_INCLUDE_DIR)
SET (${DEPENDENCY}_FOUND "YES")
# True Reality Open Source Game and Simulation Engine
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Maxim Serebrennik

# ********************************************************************************
# Finds the bID headers, which are the boost UUID extracted header files. ********
# ********************************************************************************
# ********************************************************************************
# Creates and sets variables to use through out cmake ****************************
# bID_INCLUDE_DIR - Holds the path to the bID Headers ****************************
# ********************************************************************************
# bID_FOUND - Defined if the dependency is found *********************************
# ********************************************************************************

SET (DEPENDENCY "bID")

# Finds the include files necessary for compilation
FIND_PATH (${DEPENDENCY}_INCLUDE_DIR bID/version.hpp
HINTS
$ENV{bID_INC}
$ENV{bID_ROOT}/include
$ENV{bID_ROOT}/inc
$ENV{bID_ROOT}
$ENV{TR_INC}
$ENV{TR_ROOT}/Ext/include
$ENV{TR_ROOT}/Ext
$ENV{TR_ROOT}/include
$ENV{TR_ROOT}
PATHS
/usr/include
/usr/local/include
~/Library/Frameworks
/Library/Frameworks
)
MARK_AS_ADVANCED (${DEPENDENCY}_INCLUDE_DIR)

SET (${DEPENDENCY}_FOUND "NO")
IF (${DEPENDENCY}_INCLUDE_DIR)
SET (${DEPENDENCY}_FOUND "YES")
ENDIF ()
68 changes: 34 additions & 34 deletions CMakeModules/InSourceBuild.cmake
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Maxim Serebrennik

# *****************************************************************************
# Ensures that the user does not build in the source folder *******************
# Unlike the build in CMake function, this returns a better Error Message *****
# *****************************************************************************
FUNCTION (CHECK_FOR_INSOURCE_BUILD)
# Find our paths, even with simlinks
GET_FILENAME_COMPONENT (srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
GET_FILENAME_COMPONENT (bindir "${CMAKE_BINARY_DIR}" REALPATH)

IF ("${srcdir}" STREQUAL "${bindir}")
MESSAGE ("\nPlease select a different Build folder. In-source builds are not allowed.\n\n\n")
MESSAGE (FATAL_ERROR "Quitting configuration...\n\n")
ENDIF()
ENDFUNCTION()

# True Reality Open Source Game and Simulation Engine
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
# Software Foundation; either version 3.0 of the License, or (at your option)
# any later version.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Author: Maxim Serebrennik

# *****************************************************************************
# Ensures that the user does not build in the source folder *******************
# Unlike the build in CMake function, this returns a better Error Message *****
# *****************************************************************************
FUNCTION (CHECK_FOR_INSOURCE_BUILD)
# Find our paths, even with simlinks
GET_FILENAME_COMPONENT (srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
GET_FILENAME_COMPONENT (bindir "${CMAKE_BINARY_DIR}" REALPATH)

IF ("${srcdir}" STREQUAL "${bindir}")
MESSAGE ("\nPlease select a different Build folder. In-source builds are not allowed.\n\n\n")
MESSAGE (FATAL_ERROR "Quitting configuration...\n\n")
ENDIF()
ENDFUNCTION()

CHECK_FOR_INSOURCE_BUILD()
2 changes: 1 addition & 1 deletion CMakeModules/InstallMacros.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# True Reality Open Source Game and Simulation Engine
# Copyright © 2019 Acid Rain Studios LLC
# Copyright © 2021 Acid Rain Studios LLC
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Lesser General Public License as published by the Free
Expand Down
Loading

0 comments on commit 05126ce

Please sign in to comment.