From b9e82c3bf0bda57ae7f5454c73c3072e38f4b046 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Thu, 21 Dec 2017 01:27:53 +0100 Subject: [PATCH] Fixed linux compilation --- src/cmake/platform/win/settings.cmake | 1 - src/common/CMakeLists.txt | 5 +- src/common/Collision/CMakeLists.txt | 93 +++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 src/common/Collision/CMakeLists.txt diff --git a/src/cmake/platform/win/settings.cmake b/src/cmake/platform/win/settings.cmake index e44f34413..78aa97b0b 100644 --- a/src/cmake/platform/win/settings.cmake +++ b/src/cmake/platform/win/settings.cmake @@ -3,7 +3,6 @@ option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 0) # Package overloads set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/acelite) -set(ACE_DIR ${ACE_INCLUDE_DIR}) set(ACE_LIBRARY "ace") set(BZIP2_LIBRARIES "bzip2") set(ZLIB_LIBRARIES "zlib") diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 02645fa9e..9a44d3302 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -12,7 +12,6 @@ if( USE_COREPCH ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) endif() -file(GLOB_RECURSE sources_Collision Collision/*.cpp Collision/*.h) file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration/*.h) file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography/*.h) file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h) @@ -41,7 +40,6 @@ endif() set(shared_STAT_SRCS ${shared_STAT_SRCS} - ${sources_Collision} ${sources_Configuration} ${sources_Cryptography} ${sources_Database} @@ -64,7 +62,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/deps/utf8cpp ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/Collision ${CMAKE_CURRENT_SOURCE_DIR}/Configuration ${CMAKE_CURRENT_SOURCE_DIR}/Cryptography ${CMAKE_CURRENT_SOURCE_DIR}/Database @@ -94,3 +91,5 @@ target_link_libraries(shared if (USE_COREPCH) add_cxx_pch(shared ${shared_STAT_PCH_HDR} ${shared_STAT_PCH_SRC}) endif () + +add_subdirectory(Collision) \ No newline at end of file diff --git a/src/common/Collision/CMakeLists.txt b/src/common/Collision/CMakeLists.txt new file mode 100644 index 000000000..a1c6b8b84 --- /dev/null +++ b/src/common/Collision/CMakeLists.txt @@ -0,0 +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. + +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/Include + ${CMAKE_SOURCE_DIR}/src/common/ + ${CMAKE_SOURCE_DIR}/src/common/Configuration + ${CMAKE_SOURCE_DIR}/src/common/Debugging + ${CMAKE_SOURCE_DIR}/src/common/Database + ${CMAKE_SOURCE_DIR}/src/common/Debugging + ${CMAKE_SOURCE_DIR}/src/common/Dynamic + ${CMAKE_SOURCE_DIR}/src/common/Dynamic/LinkedReference + ${CMAKE_SOURCE_DIR}/src/common/Logging + ${CMAKE_SOURCE_DIR}/src/common/Threading + ${CMAKE_SOURCE_DIR}/src/common/Packets + ${CMAKE_SOURCE_DIR}/src/common/Utilities + ${CMAKE_SOURCE_DIR}/src/common/DataStores + ${CMAKE_SOURCE_DIR}/src/server/game/Addons + ${CMAKE_SOURCE_DIR}/src/server/game/Conditions + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Item + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/GameObject + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Creature + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object/Updates + ${CMAKE_SOURCE_DIR}/src/server/game/Entities/Unit + ${CMAKE_SOURCE_DIR}/src/server/game/Combat + ${CMAKE_SOURCE_DIR}/src/server/game/Loot + ${CMAKE_SOURCE_DIR}/src/server/game/Miscellaneous + ${CMAKE_SOURCE_DIR}/src/server/game/Grids + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Cells + ${CMAKE_SOURCE_DIR}/src/server/game/Grids/Notifiers + ${CMAKE_SOURCE_DIR}/src/server/game/Maps + ${CMAKE_SOURCE_DIR}/src/server/game/DataStores + ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Waypoints + ${CMAKE_SOURCE_DIR}/src/server/game/Movement/Spline + ${CMAKE_SOURCE_DIR}/src/server/game/Movement + ${CMAKE_SOURCE_DIR}/src/server/game/Server + ${CMAKE_SOURCE_DIR}/src/server/game/Server/Protocol + ${CMAKE_SOURCE_DIR}/src/server/game/World + ${CMAKE_SOURCE_DIR}/src/server/game/Spells + ${CMAKE_SOURCE_DIR}/src/server/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 ()