From 5105333968e2f3b1e421ba739c4aac703523f873 Mon Sep 17 00:00:00 2001 From: Kargatum Date: Thu, 4 Apr 2019 16:47:17 +0700 Subject: [PATCH] feat(Core/Library): Rename shared library to common (#1675) --- src/common/CMakeLists.txt | 14 +++++++------- .../{sharedPCH.h => commonPCH.h} | 0 src/server/authserver/CMakeLists.txt | 2 +- src/server/game/CMakeLists.txt | 2 +- src/server/scripts/CMakeLists.txt | 2 +- src/server/worldserver/CMakeLists.txt | 2 +- src/tools/map_extractor/CMakeLists.txt | 4 ++-- src/tools/mesh_extractor/CMakeLists.txt | 2 +- src/tools/mmaps_generator/CMakeLists.txt | 2 +- src/tools/mmaps_generator/VMapExtensions.cpp | 12 ++++++------ src/tools/vmap4_assembler/CMakeLists.txt | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) rename src/common/PrecompiledHeaders/{sharedPCH.h => commonPCH.h} (100%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 69ea281e8..b9c166f5e 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -15,7 +15,7 @@ CollectSourceFiles( ${CMAKE_CURRENT_SOURCE_DIR}/Debugging ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) -# Manually set sources for Debugging directory as we don't want to include WheatyExceptionReport in shared project +# Manually set sources for Debugging directory as we don't want to include WheatyExceptionReport in common project # It needs to be included both in authserver and worldserver for the static global variable to be properly initialized # and to handle crash logs on windows list(APPEND PRIVATE_SOURCES @@ -23,13 +23,13 @@ list(APPEND PRIVATE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Debugging/Errors.h) if (USE_COREPCH) - set(PRIVATE_PCH_HEADER PrecompiledHeaders/sharedPCH.h) + set(PRIVATE_PCH_HEADER PrecompiledHeaders/commonPCH.h) endif() # Group sources GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) -add_library(shared +add_library(common ${PRIVATE_SOURCES} ) @@ -39,7 +39,7 @@ CollectIncludeDirectories( # Exclude ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders) -target_include_directories(shared +target_include_directories(common PUBLIC # Provide the binary dir for all child targets ${CMAKE_BINARY_DIR} @@ -47,7 +47,7 @@ target_include_directories(shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -target_link_libraries(shared +target_link_libraries(common PRIVATE game-interface PUBLIC @@ -61,12 +61,12 @@ target_link_libraries(shared threads jemalloc) -set_target_properties(shared +set_target_properties(common PROPERTIES FOLDER "server") # Generate precompiled header if (USE_COREPCH) - add_cxx_pch(shared ${PRIVATE_PCH_HEADER}) + add_cxx_pch(common ${PRIVATE_PCH_HEADER}) endif () diff --git a/src/common/PrecompiledHeaders/sharedPCH.h b/src/common/PrecompiledHeaders/commonPCH.h similarity index 100% rename from src/common/PrecompiledHeaders/sharedPCH.h rename to src/common/PrecompiledHeaders/commonPCH.h diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index 1d4f91b0b..6f68b8a40 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -44,7 +44,7 @@ endif() target_link_libraries(authserver PUBLIC - shared + common ) CollectIncludeDirectories( diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 889e5fe35..cb04ca3f3 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -37,7 +37,7 @@ target_include_directories(game-interface target_link_libraries(game-interface INTERFACE - shared) + common) add_library(game STATIC ${PRIVATE_SOURCES} diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt index 1c07a670e..7acd85e53 100644 --- a/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt @@ -91,7 +91,7 @@ target_include_directories(scripts-interface target_link_libraries(scripts-interface INTERFACE - shared) + common) add_library(scripts STATIC ${scripts_STAT_SRCS} diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 0f5bd334f..10c92a8ee 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -133,7 +133,7 @@ set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAG target_link_libraries(worldserver PUBLIC game - shared + common scripts gsoap readline diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index db10f3a48..5844bcd1b 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -16,7 +16,7 @@ CollectSourceFiles( add_executable(mapextractor ${PRIVATE_SOURCES} ) - + target_include_directories(mapextractor PUBLIC ${CMAKE_SOURCE_DIR} @@ -24,7 +24,7 @@ target_include_directories(mapextractor target_link_libraries(mapextractor PUBLIC - shared + common mpq) CollectIncludeDirectories( diff --git a/src/tools/mesh_extractor/CMakeLists.txt b/src/tools/mesh_extractor/CMakeLists.txt index f290810d8..7dcc19f1b 100644 --- a/src/tools/mesh_extractor/CMakeLists.txt +++ b/src/tools/mesh_extractor/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(MeshExtractor ${PRIVATE_SOURCES}) target_link_libraries(MeshExtractor PUBLIC - shared + common Recast mpq) diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt index f7e3dc930..c6a8fe3c4 100644 --- a/src/tools/mmaps_generator/CMakeLists.txt +++ b/src/tools/mmaps_generator/CMakeLists.txt @@ -16,7 +16,7 @@ add_executable(mmaps_generator ${PRIVATE_SOURCES}) target_link_libraries(mmaps_generator PUBLIC - shared + common Recast mpq) diff --git a/src/tools/mmaps_generator/VMapExtensions.cpp b/src/tools/mmaps_generator/VMapExtensions.cpp index ee3b028d6..2c6f48dba 100644 --- a/src/tools/mmaps_generator/VMapExtensions.cpp +++ b/src/tools/mmaps_generator/VMapExtensions.cpp @@ -19,26 +19,26 @@ namespace VMAP // Need direct access to encapsulated VMAP data, so we add functions for MMAP generator // maybe add MapBuilder as friend to all of the below classes would be better? - // declared in src/shared/vmap/MapTree.h + // declared in src/common/vmap/MapTree.h void StaticMapTree::getModelInstances(ModelInstance* &models, uint32 &count) { models = iTreeValues; count = iNTreeValues; } - // declared in src/shared/vmap/VMapManager2.h + // declared in src/common/vmap/VMapManager2.h void VMapManager2::getInstanceMapTree(InstanceTreeMap &instanceMapTree) { instanceMapTree = iInstanceMapTrees; } - // declared in src/shared/vmap/WorldModel.h + // declared in src/common/vmap/WorldModel.h void WorldModel::getGroupModels(std::vector &groupModels) { groupModels = this->groupModels; } - // declared in src/shared/vmap/WorldModel.h + // declared in src/common/vmap/WorldModel.h void GroupModel::getMeshData(std::vector &vertices, std::vector &triangles, WmoLiquid* &liquid) { vertices = this->vertices; @@ -46,13 +46,13 @@ namespace VMAP liquid = iLiquid; } - // declared in src/shared/vmap/ModelInstance.h + // declared in src/common/vmap/ModelInstance.h WorldModel* ModelInstance::getWorldModel() { return iModel; } - // declared in src/shared/vmap/WorldModel.h + // declared in src/common/vmap/WorldModel.h void WmoLiquid::getPosInfo(uint32 &tilesX, uint32 &tilesY, G3D::Vector3 &corner) const { tilesX = iTilesX; diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt index 790d834f0..59be0797a 100644 --- a/src/tools/vmap4_assembler/CMakeLists.txt +++ b/src/tools/vmap4_assembler/CMakeLists.txt @@ -16,11 +16,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") endif() target_link_libraries(vmap4assembler - shared + common zlib) # Group sources -GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) +GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties(vmap4assembler PROPERTIES