From c64f8d8e825731966f48e76aab183aca3f969f0d Mon Sep 17 00:00:00 2001 From: Yehonal Date: Fri, 13 Oct 2017 19:22:30 +0200 Subject: [PATCH] Fixed compilation after dir rework --- CMakeLists.txt | 14 +- apps/compiler/includes/includes.sh | 2 +- deps/acelite/ace/CMakeLists.txt | 4 +- deps/bzip2/CMakeLists.txt | 2 +- .../drassil/cmake-utils/.gitignore | 0 .../drassil/cmake-utils/utils.cmake | 0 .../drassil/mysql-tools/.gitignore | 0 {modules => deps}/drassil/mysql-tools/README | 0 .../drassil/mysql-tools/bin/dump-parser | Bin .../drassil/mysql-tools/bin/mysql.exe | Bin .../drassil/mysql-tools/bin/mysqldump.exe | Bin .../drassil/mysql-tools/bin/mysqlimport.exe | Bin .../drassil/mysql-tools/build-dump-parser.sh | 0 .../drassil/mysql-tools/dump-parser.c | 0 .../drassil/mysql-tools/mysql-config.dist | 0 .../drassil/mysql-tools/mysql-dump | 0 .../drassil/mysql-tools/mysql-import | 0 .../drassil/mysql-tools/mysql-tools | 0 .../drassil/mysql-tools/shared-def | 0 deps/g3dlite/CMakeLists.txt | 2 +- deps/jemalloc/CMakeLists.txt | 2 +- deps/libmpq/CMakeLists.txt | 8 +- deps/mysqllite/CMakeLists.txt | 2 +- deps/recastnavigation/Detour/CMakeLists.txt | 2 +- deps/recastnavigation/Recast/CMakeLists.txt | 2 +- install.sh | 5 +- src/CMakeLists.txt | 4 +- src/authserver/CMakeLists.txt | 18 +- src/core/CMakeLists.txt | 8 +- src/core/cmake/macros/CheckPlatform.cmake | 8 +- src/core/cmake/macros/FindGit.cmake | 2 +- src/core/cmake/platform/unix/settings.cmake | 8 +- src/core/cmake/platform/win/settings.cmake | 8 +- src/framework/CMakeLists.txt | 44 +- src/game/CMakeLists.txt | 46 +- .../{src => }/BoundingIntervalHierarchy.cpp | 0 .../{src => }/BoundingIntervalHierarchy.h | 0 .../BoundingIntervalHierarchyWrapper.h | 0 src/libraries/collision/CMakeLists.txt | 93 ++- .../collision/{src => }/DynamicTree.cpp | 0 .../collision/{src => }/DynamicTree.h | 0 src/libraries/collision/LICENSE-AGPL3 | 661 ------------------ .../{src => }/Management/IMMAPManager.h | 0 .../{src => }/Management/IVMapManager.h | 0 .../{src => }/Management/MMapFactory.cpp | 0 .../{src => }/Management/MMapFactory.h | 0 .../{src => }/Management/MMapManager.cpp | 0 .../{src => }/Management/MMapManager.h | 0 .../{src => }/Management/VMapFactory.cpp | 0 .../{src => }/Management/VMapFactory.h | 0 .../{src => }/Management/VMapManager2.cpp | 0 .../{src => }/Management/VMapManager2.h | 0 .../collision/{src => }/Maps/MapTree.cpp | 0 .../collision/{src => }/Maps/MapTree.h | 0 .../{src => }/Maps/TileAssembler.cpp | 0 .../collision/{src => }/Maps/TileAssembler.h | 0 .../{src => }/Models/GameObjectModel.cpp | 0 .../{src => }/Models/GameObjectModel.h | 0 .../{src => }/Models/ModelInstance.cpp | 0 .../{src => }/Models/ModelInstance.h | 0 .../collision/{src => }/Models/WorldModel.cpp | 0 .../collision/{src => }/Models/WorldModel.h | 0 .../PrecompiledHeaders/collisionPCH.cpp | 0 .../PrecompiledHeaders/collisionPCH.h | 0 .../collision/{src => }/RegularGrid.h | 0 .../collision/{src => }/VMapDefinitions.h | 0 src/libraries/collision/{src => }/VMapTools.h | 0 src/libraries/collision/src/CMakeLists.txt | 93 --- src/scripts/CMakeLists.txt | 48 +- src/tools/map_extractor/CMakeLists.txt | 6 +- src/tools/mesh_extractor/CMakeLists.txt | 12 +- src/tools/mmaps_generator/CMakeLists.txt | 50 +- src/tools/vmap4_assembler/CMakeLists.txt | 12 +- src/tools/vmap4_extractor/CMakeLists.txt | 4 +- src/worldserver/CMakeLists.txt | 44 +- 75 files changed, 276 insertions(+), 938 deletions(-) rename {modules => deps}/drassil/cmake-utils/.gitignore (100%) rename {modules => deps}/drassil/cmake-utils/utils.cmake (100%) rename {modules => deps}/drassil/mysql-tools/.gitignore (100%) rename {modules => deps}/drassil/mysql-tools/README (100%) rename {modules => deps}/drassil/mysql-tools/bin/dump-parser (100%) rename {modules => deps}/drassil/mysql-tools/bin/mysql.exe (100%) rename {modules => deps}/drassil/mysql-tools/bin/mysqldump.exe (100%) rename {modules => deps}/drassil/mysql-tools/bin/mysqlimport.exe (100%) rename {modules => deps}/drassil/mysql-tools/build-dump-parser.sh (100%) rename {modules => deps}/drassil/mysql-tools/dump-parser.c (100%) rename {modules => deps}/drassil/mysql-tools/mysql-config.dist (100%) rename {modules => deps}/drassil/mysql-tools/mysql-dump (100%) rename {modules => deps}/drassil/mysql-tools/mysql-import (100%) rename {modules => deps}/drassil/mysql-tools/mysql-tools (100%) rename {modules => deps}/drassil/mysql-tools/shared-def (100%) rename src/libraries/collision/{src => }/BoundingIntervalHierarchy.cpp (100%) rename src/libraries/collision/{src => }/BoundingIntervalHierarchy.h (100%) rename src/libraries/collision/{src => }/BoundingIntervalHierarchyWrapper.h (100%) rename src/libraries/collision/{src => }/DynamicTree.cpp (100%) rename src/libraries/collision/{src => }/DynamicTree.h (100%) delete mode 100644 src/libraries/collision/LICENSE-AGPL3 rename src/libraries/collision/{src => }/Management/IMMAPManager.h (100%) rename src/libraries/collision/{src => }/Management/IVMapManager.h (100%) rename src/libraries/collision/{src => }/Management/MMapFactory.cpp (100%) rename src/libraries/collision/{src => }/Management/MMapFactory.h (100%) rename src/libraries/collision/{src => }/Management/MMapManager.cpp (100%) rename src/libraries/collision/{src => }/Management/MMapManager.h (100%) rename src/libraries/collision/{src => }/Management/VMapFactory.cpp (100%) rename src/libraries/collision/{src => }/Management/VMapFactory.h (100%) rename src/libraries/collision/{src => }/Management/VMapManager2.cpp (100%) rename src/libraries/collision/{src => }/Management/VMapManager2.h (100%) rename src/libraries/collision/{src => }/Maps/MapTree.cpp (100%) rename src/libraries/collision/{src => }/Maps/MapTree.h (100%) rename src/libraries/collision/{src => }/Maps/TileAssembler.cpp (100%) rename src/libraries/collision/{src => }/Maps/TileAssembler.h (100%) rename src/libraries/collision/{src => }/Models/GameObjectModel.cpp (100%) rename src/libraries/collision/{src => }/Models/GameObjectModel.h (100%) rename src/libraries/collision/{src => }/Models/ModelInstance.cpp (100%) rename src/libraries/collision/{src => }/Models/ModelInstance.h (100%) rename src/libraries/collision/{src => }/Models/WorldModel.cpp (100%) rename src/libraries/collision/{src => }/Models/WorldModel.h (100%) rename src/libraries/collision/{src => }/PrecompiledHeaders/collisionPCH.cpp (100%) rename src/libraries/collision/{src => }/PrecompiledHeaders/collisionPCH.h (100%) rename src/libraries/collision/{src => }/RegularGrid.h (100%) rename src/libraries/collision/{src => }/VMapDefinitions.h (100%) rename src/libraries/collision/{src => }/VMapTools.h (100%) delete mode 100644 src/libraries/collision/src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e8d620b4..25f4211f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,13 +28,13 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1) set(AC_PATH_ROOT "${CMAKE_SOURCE_DIR}") # set macro-directory -set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/modules/worldengine/nucleus/src/cmake/macros") +set(CMAKE_MODULE_PATH "${AC_PATH_ROOT}/src/core/cmake/macros") include(CheckCXXSourceRuns) include(CheckIncludeFiles) # some utils for cmake -include(modules/drassil/cmake-utils/utils.cmake) +include(deps/drassil/cmake-utils/utils.cmake) include(src/cmake/ac_macros.cmake) @@ -97,16 +97,16 @@ include(src/cmake/showoptions.cmake) # Loading framework # -add_subdirectory(modules/worldengine/deps) +add_subdirectory(deps) if( SERVERS OR TOOLS) - add_subdirectory(modules/worldengine/nucleus) - add_subdirectory(modules/worldengine/lib-collision) - add_subdirectory(modules/acore/game-framework) + add_subdirectory(src/core) + add_subdirectory(src/libraries/collision) + add_subdirectory(src/framework) endif() if( TOOLS ) - add_subdirectory(modules/acore/extractors) + add_subdirectory(src/tools) endif() # diff --git a/apps/compiler/includes/includes.sh b/apps/compiler/includes/includes.sh index 358a43cf9..c425160dc 100644 --- a/apps/compiler/includes/includes.sh +++ b/apps/compiler/includes/includes.sh @@ -10,7 +10,7 @@ fi function ac_on_after_build() { # move the run engine - cp -rvf "$AC_PATH_MODULES/acore/startup-scripts/"* "$BINPATH" + cp -rvf "$AC_PATH_APPS/startup-scripts/"* "$BINPATH" } registerHooks "ON_AFTER_BUILD" ac_on_after_build diff --git a/deps/acelite/ace/CMakeLists.txt b/deps/acelite/ace/CMakeLists.txt index b90158b15..deb86f7f3 100644 --- a/deps/acelite/ace/CMakeLists.txt +++ b/deps/acelite/ace/CMakeLists.txt @@ -328,9 +328,9 @@ if (USE_COREPCH) endif() include_directories( - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite + ${CMAKE_SOURCE_DIR}/deps/acelite ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/zlib ) # Needed for PCH support diff --git a/deps/bzip2/CMakeLists.txt b/deps/bzip2/CMakeLists.txt index 4cf894419..c1c450ec6 100644 --- a/deps/bzip2/CMakeLists.txt +++ b/deps/bzip2/CMakeLists.txt @@ -15,7 +15,7 @@ set(bzip2_STAT_SRCS ) include_directories( - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/zlib ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/modules/drassil/cmake-utils/.gitignore b/deps/drassil/cmake-utils/.gitignore similarity index 100% rename from modules/drassil/cmake-utils/.gitignore rename to deps/drassil/cmake-utils/.gitignore diff --git a/modules/drassil/cmake-utils/utils.cmake b/deps/drassil/cmake-utils/utils.cmake similarity index 100% rename from modules/drassil/cmake-utils/utils.cmake rename to deps/drassil/cmake-utils/utils.cmake diff --git a/modules/drassil/mysql-tools/.gitignore b/deps/drassil/mysql-tools/.gitignore similarity index 100% rename from modules/drassil/mysql-tools/.gitignore rename to deps/drassil/mysql-tools/.gitignore diff --git a/modules/drassil/mysql-tools/README b/deps/drassil/mysql-tools/README similarity index 100% rename from modules/drassil/mysql-tools/README rename to deps/drassil/mysql-tools/README diff --git a/modules/drassil/mysql-tools/bin/dump-parser b/deps/drassil/mysql-tools/bin/dump-parser similarity index 100% rename from modules/drassil/mysql-tools/bin/dump-parser rename to deps/drassil/mysql-tools/bin/dump-parser diff --git a/modules/drassil/mysql-tools/bin/mysql.exe b/deps/drassil/mysql-tools/bin/mysql.exe similarity index 100% rename from modules/drassil/mysql-tools/bin/mysql.exe rename to deps/drassil/mysql-tools/bin/mysql.exe diff --git a/modules/drassil/mysql-tools/bin/mysqldump.exe b/deps/drassil/mysql-tools/bin/mysqldump.exe similarity index 100% rename from modules/drassil/mysql-tools/bin/mysqldump.exe rename to deps/drassil/mysql-tools/bin/mysqldump.exe diff --git a/modules/drassil/mysql-tools/bin/mysqlimport.exe b/deps/drassil/mysql-tools/bin/mysqlimport.exe similarity index 100% rename from modules/drassil/mysql-tools/bin/mysqlimport.exe rename to deps/drassil/mysql-tools/bin/mysqlimport.exe diff --git a/modules/drassil/mysql-tools/build-dump-parser.sh b/deps/drassil/mysql-tools/build-dump-parser.sh similarity index 100% rename from modules/drassil/mysql-tools/build-dump-parser.sh rename to deps/drassil/mysql-tools/build-dump-parser.sh diff --git a/modules/drassil/mysql-tools/dump-parser.c b/deps/drassil/mysql-tools/dump-parser.c similarity index 100% rename from modules/drassil/mysql-tools/dump-parser.c rename to deps/drassil/mysql-tools/dump-parser.c diff --git a/modules/drassil/mysql-tools/mysql-config.dist b/deps/drassil/mysql-tools/mysql-config.dist similarity index 100% rename from modules/drassil/mysql-tools/mysql-config.dist rename to deps/drassil/mysql-tools/mysql-config.dist diff --git a/modules/drassil/mysql-tools/mysql-dump b/deps/drassil/mysql-tools/mysql-dump similarity index 100% rename from modules/drassil/mysql-tools/mysql-dump rename to deps/drassil/mysql-tools/mysql-dump diff --git a/modules/drassil/mysql-tools/mysql-import b/deps/drassil/mysql-tools/mysql-import similarity index 100% rename from modules/drassil/mysql-tools/mysql-import rename to deps/drassil/mysql-tools/mysql-import diff --git a/modules/drassil/mysql-tools/mysql-tools b/deps/drassil/mysql-tools/mysql-tools similarity index 100% rename from modules/drassil/mysql-tools/mysql-tools rename to deps/drassil/mysql-tools/mysql-tools diff --git a/modules/drassil/mysql-tools/shared-def b/deps/drassil/mysql-tools/shared-def similarity index 100% rename from modules/drassil/mysql-tools/shared-def rename to deps/drassil/mysql-tools/shared-def diff --git a/deps/g3dlite/CMakeLists.txt b/deps/g3dlite/CMakeLists.txt index 8e75bdf17..120b8741e 100644 --- a/deps/g3dlite/CMakeLists.txt +++ b/deps/g3dlite/CMakeLists.txt @@ -57,7 +57,7 @@ set(g3dlib_STAT_SRCS if(WIN32) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/zlib ) else() include_directories( diff --git a/deps/jemalloc/CMakeLists.txt b/deps/jemalloc/CMakeLists.txt index fe976cb6c..b1725f6e1 100644 --- a/deps/jemalloc/CMakeLists.txt +++ b/deps/jemalloc/CMakeLists.txt @@ -19,7 +19,7 @@ endif() # Create the header, so we can use it configure_file( - "${CMAKE_SOURCE_DIR}/modules/worldengine/deps/jemalloc/jemalloc_defs.h.in.cmake" + "${CMAKE_SOURCE_DIR}/deps/jemalloc/jemalloc_defs.h.in.cmake" "${BUILDDIR}/jemalloc_defs.h" @ONLY ) diff --git a/deps/libmpq/CMakeLists.txt b/deps/libmpq/CMakeLists.txt index c3e20934d..34e1c3521 100644 --- a/deps/libmpq/CMakeLists.txt +++ b/deps/libmpq/CMakeLists.txt @@ -17,15 +17,15 @@ set(mpq_STAT_SRCS if( UNIX ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2 + ${CMAKE_SOURCE_DIR}/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/bzip2 ) elseif( WIN32 ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/win - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2 + ${CMAKE_SOURCE_DIR}/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/bzip2 ) endif() diff --git a/deps/mysqllite/CMakeLists.txt b/deps/mysqllite/CMakeLists.txt index 29fda1813..8d169d56f 100644 --- a/deps/mysqllite/CMakeLists.txt +++ b/deps/mysqllite/CMakeLists.txt @@ -54,7 +54,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${OPENSSL_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/zlib ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/internal ${CMAKE_CURRENT_SOURCE_DIR}/dbug diff --git a/deps/recastnavigation/Detour/CMakeLists.txt b/deps/recastnavigation/Detour/CMakeLists.txt index a0028f9c9..233d12343 100644 --- a/deps/recastnavigation/Detour/CMakeLists.txt +++ b/deps/recastnavigation/Detour/CMakeLists.txt @@ -19,7 +19,7 @@ set(Detour_STAT_SRCS if(WIN32) include_directories( - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/zlib ) endif() diff --git a/deps/recastnavigation/Recast/CMakeLists.txt b/deps/recastnavigation/Recast/CMakeLists.txt index 2bf1518bc..975b4a9c1 100644 --- a/deps/recastnavigation/Recast/CMakeLists.txt +++ b/deps/recastnavigation/Recast/CMakeLists.txt @@ -22,7 +22,7 @@ set(Recast_STAT_SRCS if(WIN32) include_directories( - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/zlib ) endif() diff --git a/install.sh b/install.sh index 8c6c42fe0..af88b78e1 100755 --- a/install.sh +++ b/install.sh @@ -1,9 +1,10 @@ #!/usr/bin/env bash CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +PATH_APPS="$CUR_PATH/apps/" PATH_MODULES="$CUR_PATH/modules/" -[ ! -d $PATH_MODULES/drassil/joiner ] && git clone https://github.com/drassil/joiner $PATH_MODULES/drassil/joiner -b master -source "$PATH_MODULES/drassil/joiner/joiner.sh" +[ ! -d $PATH_APPS/drassil/joiner ] && git clone https://github.com/drassil/joiner $PATH_APPS/drassil/joiner -b master +source "$PATH_APPS/drassil/joiner/joiner.sh" # installing repository dependencies diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4d106ab3a..7d80aaf94 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,8 +20,8 @@ add_subdirectory(genrev) if( SERVERS ) set(sources_windows_Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.cpp - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging/WheatyExceptionReport.h + ${CMAKE_SOURCE_DIR}/src/core/Debugging/WheatyExceptionReport.cpp + ${CMAKE_SOURCE_DIR}/src/core/Debugging/WheatyExceptionReport.h ) add_subdirectory(game) add_subdirectory(authserver) diff --git a/src/authserver/CMakeLists.txt b/src/authserver/CMakeLists.txt index 4fa2f788e..43c6d7794 100644 --- a/src/authserver/CMakeLists.txt +++ b/src/authserver/CMakeLists.txt @@ -43,15 +43,15 @@ endif() include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Cryptography + ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Utilities ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Authentication ${CMAKE_CURRENT_SOURCE_DIR}/Realms diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index a7f3f81eb..cedfc7fb2 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -56,10 +56,10 @@ set(shared_STAT_SRCS include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/utf8cpp + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/deps/SFMT + ${CMAKE_SOURCE_DIR}/deps/sockets/include + ${CMAKE_SOURCE_DIR}/deps/utf8cpp ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Configuration diff --git a/src/core/cmake/macros/CheckPlatform.cmake b/src/core/cmake/macros/CheckPlatform.cmake index 8c7513ff0..c2d5866ec 100644 --- a/src/core/cmake/macros/CheckPlatform.cmake +++ b/src/core/cmake/macros/CheckPlatform.cmake @@ -7,12 +7,12 @@ else() MESSAGE(STATUS "Detected 32-bit platform") endif() -include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/settings.cmake") +include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/settings.cmake") if(WIN32) - include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake") + include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/win/settings.cmake") elseif(UNIX) - include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake") + include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/unix/settings.cmake") endif() -include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake") +include("${CMAKE_SOURCE_DIR}/src/core/cmake/platform/after_platform.cmake") diff --git a/src/core/cmake/macros/FindGit.cmake b/src/core/cmake/macros/FindGit.cmake index ca37cd7d6..0c4db36b4 100644 --- a/src/core/cmake/macros/FindGit.cmake +++ b/src/core/cmake/macros/FindGit.cmake @@ -7,7 +7,7 @@ # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/macros/EnsureVersion.cmake) +include(${CMAKE_SOURCE_DIR}/src/core/cmake/macros/EnsureVersion.cmake) set(_REQUIRED_GIT_VERSION "1.7") diff --git a/src/core/cmake/platform/unix/settings.cmake b/src/core/cmake/platform/unix/settings.cmake index 632df48fe..e54efac02 100644 --- a/src/core/cmake/platform/unix/settings.cmake +++ b/src/core/cmake/platform/unix/settings.cmake @@ -20,7 +20,7 @@ endif() # configure uninstaller configure_file( - "${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/cmake_uninstall.in.cmake" + "${CMAKE_SOURCE_DIR}/src/core/cmake/platform/cmake_uninstall.in.cmake" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" @ONLY ) @@ -34,11 +34,11 @@ message(STATUS "UNIX: Created uninstall target") message(STATUS "UNIX: Detected compiler: ${CMAKE_C_COMPILER}") if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU") - include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake) + include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") - include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/icc/settings.cmake) + include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/icc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang") - include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake) + include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/clang/settings.cmake) else() add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') endif() diff --git a/src/core/cmake/platform/win/settings.cmake b/src/core/cmake/platform/win/settings.cmake index 319164f76..59387222a 100644 --- a/src/core/cmake/platform/win/settings.cmake +++ b/src/core/cmake/platform/win/settings.cmake @@ -2,13 +2,13 @@ option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 0) # Package overloads -set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/acelite) +set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/acelite) set(ACE_LIBRARY "ace") set(BZIP2_LIBRARIES "bzip2") set(ZLIB_LIBRARIES "zlib") if( USE_MYSQL_SOURCES ) - set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/mysqllite/include) + set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/mysqllite/include) set(MYSQL_LIBRARY "libmysql") set( MYSQL_FOUND 1 ) message(STATUS "Using supplied MySQL sources") @@ -26,7 +26,7 @@ endif() #endif() if ( MSVC ) - include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/msvc/settings.cmake) + include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/msvc/settings.cmake) elseif ( MINGW ) - include(${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/compiler/mingw/settings.cmake) + include(${CMAKE_SOURCE_DIR}/src/core/cmake/compiler/mingw/settings.cmake) endif() diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index 94b4628ba..5320f4a9e 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -21,28 +21,28 @@ set(gamefw_STAT_SRCS include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/ - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/deps/SFMT + ${CMAKE_SOURCE_DIR}/deps/zlib + ${CMAKE_SOURCE_DIR}/src/libraries/collision/ + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Cryptography + ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/DataStores + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/core/Dynamic + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Utilities ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Addons ${ACE_INCLUDE_DIR} diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 1e92e4135..1eb7d66f8 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -111,29 +111,29 @@ set(game_STAT_SRCS include_directories( ${game_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/ - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities - ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/deps/SFMT + ${CMAKE_SOURCE_DIR}/deps/zlib + ${CMAKE_SOURCE_DIR}/src/libraries/collision/ + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Cryptography + ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/DataStores + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/core/Dynamic + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Utilities + ${CMAKE_SOURCE_DIR}/src/framework/Addons ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Accounts ${CMAKE_CURRENT_SOURCE_DIR}/Achievements diff --git a/src/libraries/collision/src/BoundingIntervalHierarchy.cpp b/src/libraries/collision/BoundingIntervalHierarchy.cpp similarity index 100% rename from src/libraries/collision/src/BoundingIntervalHierarchy.cpp rename to src/libraries/collision/BoundingIntervalHierarchy.cpp diff --git a/src/libraries/collision/src/BoundingIntervalHierarchy.h b/src/libraries/collision/BoundingIntervalHierarchy.h similarity index 100% rename from src/libraries/collision/src/BoundingIntervalHierarchy.h rename to src/libraries/collision/BoundingIntervalHierarchy.h diff --git a/src/libraries/collision/src/BoundingIntervalHierarchyWrapper.h b/src/libraries/collision/BoundingIntervalHierarchyWrapper.h similarity index 100% rename from src/libraries/collision/src/BoundingIntervalHierarchyWrapper.h rename to src/libraries/collision/BoundingIntervalHierarchyWrapper.h diff --git a/src/libraries/collision/CMakeLists.txt b/src/libraries/collision/CMakeLists.txt index 4b43d67e3..3aad291df 100644 --- a/src/libraries/collision/CMakeLists.txt +++ b/src/libraries/collision/CMakeLists.txt @@ -1,2 +1,93 @@ +# Copyright (C) +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -add_subdirectory(src) +if( USE_COREPCH ) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) +endif() + +file(GLOB_RECURSE sources_Management Management/*.cpp Management/*.h) +file(GLOB_RECURSE sources_Maps Maps/*.cpp Maps/*.h) +file(GLOB_RECURSE sources_Models Models/*.cpp Models/*.h) +file(GLOB sources_localdir *.cpp *.h) + +if (USE_COREPCH) + set(collision_STAT_PCH_HDR PrecompiledHeaders/collisionPCH.h) + set(collision_STAT_PCH_SRC PrecompiledHeaders/collisionPCH.cpp) +endif () + +set(collision_STAT_SRCS + ${collision_STAT_SRCS} + ${sources_Management} + ${sources_Maps} + ${sources_Models} + ${sources_localdir} +) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/src/core/ + ${CMAKE_SOURCE_DIR}/src/core/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Dynamic + ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Utilities + ${CMAKE_SOURCE_DIR}/src/core/DataStores + ${CMAKE_SOURCE_DIR}/src/framework/Addons + ${CMAKE_SOURCE_DIR}/src/game/Conditions + ${CMAKE_SOURCE_DIR}/src/game/Entities/Item + ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject + ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature + ${CMAKE_SOURCE_DIR}/src/game/Entities/Object + ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates + ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit + ${CMAKE_SOURCE_DIR}/src/game/Combat + ${CMAKE_SOURCE_DIR}/src/game/Loot + ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous + ${CMAKE_SOURCE_DIR}/src/game/Grids + ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells + ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers + ${CMAKE_SOURCE_DIR}/src/game/Maps + ${CMAKE_SOURCE_DIR}/src/game/DataStores + ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints + ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline + ${CMAKE_SOURCE_DIR}/src/game/Movement + ${CMAKE_SOURCE_DIR}/src/game/Server + ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol + ${CMAKE_SOURCE_DIR}/src/game/World + ${CMAKE_SOURCE_DIR}/src/game/Spells + ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/Management + ${CMAKE_CURRENT_SOURCE_DIR}/Maps + ${CMAKE_CURRENT_SOURCE_DIR}/Models + ${ACE_INCLUDE_DIR} + ${MYSQL_INCLUDE_DIR} +) + +add_library(collision STATIC + ${collision_STAT_SRCS} + ${collision_STAT_PCH_SRC} +) + +target_link_libraries(collision + shared +) + +# Generate precompiled header +if (USE_COREPCH) + add_cxx_pch(collision ${collision_STAT_PCH_HDR} ${collision_STAT_PCH_SRC}) +endif () diff --git a/src/libraries/collision/src/DynamicTree.cpp b/src/libraries/collision/DynamicTree.cpp similarity index 100% rename from src/libraries/collision/src/DynamicTree.cpp rename to src/libraries/collision/DynamicTree.cpp diff --git a/src/libraries/collision/src/DynamicTree.h b/src/libraries/collision/DynamicTree.h similarity index 100% rename from src/libraries/collision/src/DynamicTree.h rename to src/libraries/collision/DynamicTree.h diff --git a/src/libraries/collision/LICENSE-AGPL3 b/src/libraries/collision/LICENSE-AGPL3 deleted file mode 100644 index dbbe35581..000000000 --- a/src/libraries/collision/LICENSE-AGPL3 +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/src/libraries/collision/src/Management/IMMAPManager.h b/src/libraries/collision/Management/IMMAPManager.h similarity index 100% rename from src/libraries/collision/src/Management/IMMAPManager.h rename to src/libraries/collision/Management/IMMAPManager.h diff --git a/src/libraries/collision/src/Management/IVMapManager.h b/src/libraries/collision/Management/IVMapManager.h similarity index 100% rename from src/libraries/collision/src/Management/IVMapManager.h rename to src/libraries/collision/Management/IVMapManager.h diff --git a/src/libraries/collision/src/Management/MMapFactory.cpp b/src/libraries/collision/Management/MMapFactory.cpp similarity index 100% rename from src/libraries/collision/src/Management/MMapFactory.cpp rename to src/libraries/collision/Management/MMapFactory.cpp diff --git a/src/libraries/collision/src/Management/MMapFactory.h b/src/libraries/collision/Management/MMapFactory.h similarity index 100% rename from src/libraries/collision/src/Management/MMapFactory.h rename to src/libraries/collision/Management/MMapFactory.h diff --git a/src/libraries/collision/src/Management/MMapManager.cpp b/src/libraries/collision/Management/MMapManager.cpp similarity index 100% rename from src/libraries/collision/src/Management/MMapManager.cpp rename to src/libraries/collision/Management/MMapManager.cpp diff --git a/src/libraries/collision/src/Management/MMapManager.h b/src/libraries/collision/Management/MMapManager.h similarity index 100% rename from src/libraries/collision/src/Management/MMapManager.h rename to src/libraries/collision/Management/MMapManager.h diff --git a/src/libraries/collision/src/Management/VMapFactory.cpp b/src/libraries/collision/Management/VMapFactory.cpp similarity index 100% rename from src/libraries/collision/src/Management/VMapFactory.cpp rename to src/libraries/collision/Management/VMapFactory.cpp diff --git a/src/libraries/collision/src/Management/VMapFactory.h b/src/libraries/collision/Management/VMapFactory.h similarity index 100% rename from src/libraries/collision/src/Management/VMapFactory.h rename to src/libraries/collision/Management/VMapFactory.h diff --git a/src/libraries/collision/src/Management/VMapManager2.cpp b/src/libraries/collision/Management/VMapManager2.cpp similarity index 100% rename from src/libraries/collision/src/Management/VMapManager2.cpp rename to src/libraries/collision/Management/VMapManager2.cpp diff --git a/src/libraries/collision/src/Management/VMapManager2.h b/src/libraries/collision/Management/VMapManager2.h similarity index 100% rename from src/libraries/collision/src/Management/VMapManager2.h rename to src/libraries/collision/Management/VMapManager2.h diff --git a/src/libraries/collision/src/Maps/MapTree.cpp b/src/libraries/collision/Maps/MapTree.cpp similarity index 100% rename from src/libraries/collision/src/Maps/MapTree.cpp rename to src/libraries/collision/Maps/MapTree.cpp diff --git a/src/libraries/collision/src/Maps/MapTree.h b/src/libraries/collision/Maps/MapTree.h similarity index 100% rename from src/libraries/collision/src/Maps/MapTree.h rename to src/libraries/collision/Maps/MapTree.h diff --git a/src/libraries/collision/src/Maps/TileAssembler.cpp b/src/libraries/collision/Maps/TileAssembler.cpp similarity index 100% rename from src/libraries/collision/src/Maps/TileAssembler.cpp rename to src/libraries/collision/Maps/TileAssembler.cpp diff --git a/src/libraries/collision/src/Maps/TileAssembler.h b/src/libraries/collision/Maps/TileAssembler.h similarity index 100% rename from src/libraries/collision/src/Maps/TileAssembler.h rename to src/libraries/collision/Maps/TileAssembler.h diff --git a/src/libraries/collision/src/Models/GameObjectModel.cpp b/src/libraries/collision/Models/GameObjectModel.cpp similarity index 100% rename from src/libraries/collision/src/Models/GameObjectModel.cpp rename to src/libraries/collision/Models/GameObjectModel.cpp diff --git a/src/libraries/collision/src/Models/GameObjectModel.h b/src/libraries/collision/Models/GameObjectModel.h similarity index 100% rename from src/libraries/collision/src/Models/GameObjectModel.h rename to src/libraries/collision/Models/GameObjectModel.h diff --git a/src/libraries/collision/src/Models/ModelInstance.cpp b/src/libraries/collision/Models/ModelInstance.cpp similarity index 100% rename from src/libraries/collision/src/Models/ModelInstance.cpp rename to src/libraries/collision/Models/ModelInstance.cpp diff --git a/src/libraries/collision/src/Models/ModelInstance.h b/src/libraries/collision/Models/ModelInstance.h similarity index 100% rename from src/libraries/collision/src/Models/ModelInstance.h rename to src/libraries/collision/Models/ModelInstance.h diff --git a/src/libraries/collision/src/Models/WorldModel.cpp b/src/libraries/collision/Models/WorldModel.cpp similarity index 100% rename from src/libraries/collision/src/Models/WorldModel.cpp rename to src/libraries/collision/Models/WorldModel.cpp diff --git a/src/libraries/collision/src/Models/WorldModel.h b/src/libraries/collision/Models/WorldModel.h similarity index 100% rename from src/libraries/collision/src/Models/WorldModel.h rename to src/libraries/collision/Models/WorldModel.h diff --git a/src/libraries/collision/src/PrecompiledHeaders/collisionPCH.cpp b/src/libraries/collision/PrecompiledHeaders/collisionPCH.cpp similarity index 100% rename from src/libraries/collision/src/PrecompiledHeaders/collisionPCH.cpp rename to src/libraries/collision/PrecompiledHeaders/collisionPCH.cpp diff --git a/src/libraries/collision/src/PrecompiledHeaders/collisionPCH.h b/src/libraries/collision/PrecompiledHeaders/collisionPCH.h similarity index 100% rename from src/libraries/collision/src/PrecompiledHeaders/collisionPCH.h rename to src/libraries/collision/PrecompiledHeaders/collisionPCH.h diff --git a/src/libraries/collision/src/RegularGrid.h b/src/libraries/collision/RegularGrid.h similarity index 100% rename from src/libraries/collision/src/RegularGrid.h rename to src/libraries/collision/RegularGrid.h diff --git a/src/libraries/collision/src/VMapDefinitions.h b/src/libraries/collision/VMapDefinitions.h similarity index 100% rename from src/libraries/collision/src/VMapDefinitions.h rename to src/libraries/collision/VMapDefinitions.h diff --git a/src/libraries/collision/src/VMapTools.h b/src/libraries/collision/VMapTools.h similarity index 100% rename from src/libraries/collision/src/VMapTools.h rename to src/libraries/collision/VMapTools.h diff --git a/src/libraries/collision/src/CMakeLists.txt b/src/libraries/collision/src/CMakeLists.txt deleted file mode 100644 index 012c68bd5..000000000 --- a/src/libraries/collision/src/CMakeLists.txt +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -if( USE_COREPCH ) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) -endif() - -file(GLOB_RECURSE sources_Management Management/*.cpp Management/*.h) -file(GLOB_RECURSE sources_Maps Maps/*.cpp Maps/*.h) -file(GLOB_RECURSE sources_Models Models/*.cpp Models/*.h) -file(GLOB sources_localdir *.cpp *.h) - -if (USE_COREPCH) - set(collision_STAT_PCH_HDR PrecompiledHeaders/collisionPCH.h) - set(collision_STAT_PCH_SRC PrecompiledHeaders/collisionPCH.cpp) -endif () - -set(collision_STAT_SRCS - ${collision_STAT_SRCS} - ${sources_Management} - ${sources_Maps} - ${sources_Models} - ${sources_localdir} -) - -include_directories( - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores - ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons - ${CMAKE_SOURCE_DIR}/src/game/Conditions - ${CMAKE_SOURCE_DIR}/src/game/Entities/Item - ${CMAKE_SOURCE_DIR}/src/game/Entities/GameObject - ${CMAKE_SOURCE_DIR}/src/game/Entities/Creature - ${CMAKE_SOURCE_DIR}/src/game/Entities/Object - ${CMAKE_SOURCE_DIR}/src/game/Entities/Object/Updates - ${CMAKE_SOURCE_DIR}/src/game/Entities/Unit - ${CMAKE_SOURCE_DIR}/src/game/Combat - ${CMAKE_SOURCE_DIR}/src/game/Loot - ${CMAKE_SOURCE_DIR}/src/game/Miscellaneous - ${CMAKE_SOURCE_DIR}/src/game/Grids - ${CMAKE_SOURCE_DIR}/src/game/Grids/Cells - ${CMAKE_SOURCE_DIR}/src/game/Grids/Notifiers - ${CMAKE_SOURCE_DIR}/src/game/Maps - ${CMAKE_SOURCE_DIR}/src/game/DataStores - ${CMAKE_SOURCE_DIR}/src/game/Movement/Waypoints - ${CMAKE_SOURCE_DIR}/src/game/Movement/Spline - ${CMAKE_SOURCE_DIR}/src/game/Movement - ${CMAKE_SOURCE_DIR}/src/game/Server - ${CMAKE_SOURCE_DIR}/src/game/Server/Protocol - ${CMAKE_SOURCE_DIR}/src/game/World - ${CMAKE_SOURCE_DIR}/src/game/Spells - ${CMAKE_SOURCE_DIR}/src/game/Spells/Auras - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/Management - ${CMAKE_CURRENT_SOURCE_DIR}/Maps - ${CMAKE_CURRENT_SOURCE_DIR}/Models - ${ACE_INCLUDE_DIR} - ${MYSQL_INCLUDE_DIR} -) - -add_library(collision STATIC - ${collision_STAT_SRCS} - ${collision_STAT_PCH_SRC} -) - -target_link_libraries(collision - shared -) - -# Generate precompiled header -if (USE_COREPCH) - add_cxx_pch(collision ${collision_STAT_PCH_HDR} ${collision_STAT_PCH_SRC}) -endif () diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt index 27945f839..20576191c 100644 --- a/src/scripts/CMakeLists.txt +++ b/src/scripts/CMakeLists.txt @@ -78,29 +78,29 @@ message("") include_directories( ${scripts_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/ - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/deps/SFMT + ${CMAKE_SOURCE_DIR}/deps/zlib + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Cryptography + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/DataStores + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/core/Dynamic + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Utilities + ${CMAKE_SOURCE_DIR}/src/libraries/collision/ + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/framework/Addons ${CMAKE_SOURCE_DIR}/src/game/Accounts ${CMAKE_SOURCE_DIR}/src/game/Achievements ${CMAKE_SOURCE_DIR}/src/game/AI @@ -116,7 +116,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/game/Chat ${CMAKE_SOURCE_DIR}/src/game/Chat/Channels ${CMAKE_SOURCE_DIR}/src/game/Conditions - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Configuration ${CMAKE_SOURCE_DIR}/src/game/Combat ${CMAKE_SOURCE_DIR}/src/game/DataStores ${CMAKE_SOURCE_DIR}/src/game/DungeonFinding diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 872c9f519..0945371ce 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -12,8 +12,8 @@ file(GLOB_RECURSE sources *.cpp *.h) set(include_Dirs - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/deps/libmpq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/loadlib ) @@ -21,7 +21,7 @@ set(include_Dirs if( WIN32 ) set(include_Dirs ${include_Dirs} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win + ${CMAKE_SOURCE_DIR}/deps/libmpq/win ) endif() diff --git a/src/tools/mesh_extractor/CMakeLists.txt b/src/tools/mesh_extractor/CMakeLists.txt index 445532ba9..0d3a7b441 100644 --- a/src/tools/mesh_extractor/CMakeLists.txt +++ b/src/tools/mesh_extractor/CMakeLists.txt @@ -13,11 +13,11 @@ file(GLOB_RECURSE meshExtract_Sources *.cpp *.h) set(include_Base ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/deps/libmpq + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include ${ACE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -25,7 +25,7 @@ set(include_Base if( WIN32 ) set(include_Base ${include_Base} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win + ${CMAKE_SOURCE_DIR}/deps/libmpq/win ) endif() diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index 9beb46eb2..712df819a 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -15,30 +15,30 @@ set(mmap_gen_Includes ${ACE_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/zlib - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/bzip2 - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Recast - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/ - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities - ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons + ${CMAKE_SOURCE_DIR}/deps/libmpq + ${CMAKE_SOURCE_DIR}/deps/zlib + ${CMAKE_SOURCE_DIR}/deps/bzip2 + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Recast + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/src/libraries/collision/ + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Cryptography + ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/DataStores + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/core/Dynamic + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Utilities + ${CMAKE_SOURCE_DIR}/src/framework/Addons ${CMAKE_SOURCE_DIR}/src/game ${CMAKE_SOURCE_DIR}/src/game/Accounts ${CMAKE_SOURCE_DIR}/src/game/Achievements @@ -111,7 +111,7 @@ set(mmap_gen_Includes if( WIN32 ) set(mmap_gen_Includes ${mmap_gen_Includes} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win + ${CMAKE_SOURCE_DIR}/deps/libmpq/win ) endif() diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt index 177550f9a..d63358566 100644 --- a/src/tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/vmap4_assembler/CMakeLists.txt @@ -10,12 +10,12 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. include_directories( - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/ - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Maps - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/libraries/collision/ + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Maps + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models ${ACE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt index 4cc103ecf..f84093b39 100644 --- a/src/tools/vmap4_extractor/CMakeLists.txt +++ b/src/tools/vmap4_extractor/CMakeLists.txt @@ -12,13 +12,13 @@ file(GLOB_RECURSE sources *.cpp *.h) set(include_Dirs - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq + ${CMAKE_SOURCE_DIR}/deps/libmpq ) if( WIN32 ) set(include_Dirs ${include_Dirs} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/libmpq/win + ${CMAKE_SOURCE_DIR}/deps/libmpq/win ) endif() diff --git a/src/worldserver/CMakeLists.txt b/src/worldserver/CMakeLists.txt index ae5ce9391..6f8a0c4ce 100644 --- a/src/worldserver/CMakeLists.txt +++ b/src/worldserver/CMakeLists.txt @@ -43,28 +43,28 @@ endif() include_directories( ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/g3dlite/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/gsoap - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include - ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/ - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Management - ${CMAKE_SOURCE_DIR}/modules/worldengine/lib-collision/src/Models - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Configuration - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Cryptography/Authentication - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Database - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/DataStores - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Debugging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic/LinkedReference - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Dynamic - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Logging - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Packets - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Threading - ${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/Utilities - ${CMAKE_SOURCE_DIR}/modules/acore/game-framework/src/Addons + ${CMAKE_SOURCE_DIR}/deps/g3dlite/include + ${CMAKE_SOURCE_DIR}/deps/recastnavigation/Detour + ${CMAKE_SOURCE_DIR}/deps/gsoap + ${CMAKE_SOURCE_DIR}/deps/sockets/include + ${CMAKE_SOURCE_DIR}/deps/SFMT + ${CMAKE_SOURCE_DIR}/src/libraries/collision/ + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Management + ${CMAKE_SOURCE_DIR}/src/libraries/collision/Models + ${CMAKE_SOURCE_DIR}/src/core + ${CMAKE_SOURCE_DIR}/src/core/Configuration + ${CMAKE_SOURCE_DIR}/src/core/Cryptography + ${CMAKE_SOURCE_DIR}/src/core/Cryptography/Authentication + ${CMAKE_SOURCE_DIR}/src/core/Database + ${CMAKE_SOURCE_DIR}/src/core/DataStores + ${CMAKE_SOURCE_DIR}/src/core/Debugging + ${CMAKE_SOURCE_DIR}/src/core/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/core/Dynamic + ${CMAKE_SOURCE_DIR}/src/core/Logging + ${CMAKE_SOURCE_DIR}/src/core/Packets + ${CMAKE_SOURCE_DIR}/src/core/Threading + ${CMAKE_SOURCE_DIR}/src/core/Utilities + ${CMAKE_SOURCE_DIR}/src/framework/Addons ${game_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/game ${CMAKE_SOURCE_DIR}/src/game/Accounts