feat(Core/Library): Rename shared library to common (#1675)

This commit is contained in:
Kargatum
2019-04-04 16:47:17 +07:00
committed by GitHub
parent 7ad58aa6ea
commit 5105333968
11 changed files with 23 additions and 23 deletions
+2 -2
View File
@@ -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(
+1 -1
View File
@@ -17,7 +17,7 @@ add_executable(MeshExtractor ${PRIVATE_SOURCES})
target_link_libraries(MeshExtractor
PUBLIC
shared
common
Recast
mpq)
+1 -1
View File
@@ -16,7 +16,7 @@ add_executable(mmaps_generator ${PRIVATE_SOURCES})
target_link_libraries(mmaps_generator
PUBLIC
shared
common
Recast
mpq)
+6 -6
View File
@@ -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<GroupModel> &groupModels)
{
groupModels = this->groupModels;
}
// declared in src/shared/vmap/WorldModel.h
// declared in src/common/vmap/WorldModel.h
void GroupModel::getMeshData(std::vector<G3D::Vector3> &vertices, std::vector<MeshTriangle> &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;
+2 -2
View File
@@ -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