From e0cb17f0987afa7a93a98d1417e4abb5511d19a9 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 10 Aug 2016 08:49:33 +0200 Subject: [PATCH] Core/Shared: Converted the shared library to a shared library ,-). * There is still the possibility to static link against shared. --- src/server/shared/CMakeLists.txt | 14 ++++++++++++++ src/server/shared/DataStores/DB2FileLoader.h | 2 +- src/server/shared/DataStores/DBCFileLoader.h | 2 +- src/server/shared/Packets/ByteBuffer.h | 6 +++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index fc4f3776a0..807c3780e8 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -25,6 +25,8 @@ endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) +add_definitions(-DTRINITY_API_EXPORT_SHARED) + add_library(shared ${PRIVATE_PCH_SOURCE} ${PRIVATE_SOURCES} @@ -51,6 +53,18 @@ set_target_properties(shared FOLDER "server") +if( BUILD_SHARED_LIBS ) + if( UNIX ) + install(TARGETS shared + LIBRARY + DESTINATION lib) + elseif( WIN32 ) + install(TARGETS shared + RUNTIME + DESTINATION "${CMAKE_INSTALL_PREFIX}") + endif() +endif() + # Generate precompiled header if (USE_COREPCH) add_cxx_pch(shared ${PRIVATE_PCH_HEADER} ${PRIVATE_PCH_SOURCE}) diff --git a/src/server/shared/DataStores/DB2FileLoader.h b/src/server/shared/DataStores/DB2FileLoader.h index 86350ebf1d..001980c4e4 100644 --- a/src/server/shared/DataStores/DB2FileLoader.h +++ b/src/server/shared/DataStores/DB2FileLoader.h @@ -22,7 +22,7 @@ #include "Utilities/ByteConverter.h" #include -class DB2FileLoader +class TC_SHARED_API DB2FileLoader { public: DB2FileLoader(); diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index 1fa7edae7b..76555c8078 100644 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -22,7 +22,7 @@ #include "Utilities/ByteConverter.h" #include -class DBCFileLoader +class TC_SHARED_API DBCFileLoader { public: DBCFileLoader(); diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index e282a06bb9..349d4808ee 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -29,7 +29,7 @@ class MessageBuffer; // Root of ByteBuffer exception hierarchy -class ByteBufferException : public std::exception +class TC_SHARED_API ByteBufferException : public std::exception { public: ~ByteBufferException() throw() { } @@ -43,7 +43,7 @@ private: std::string msg_; }; -class ByteBufferPositionException : public ByteBufferException +class TC_SHARED_API ByteBufferPositionException : public ByteBufferException { public: ByteBufferPositionException(bool add, size_t pos, size_t size, size_t valueSize); @@ -59,7 +59,7 @@ public: ~ByteBufferSourceException() throw() { } }; -class ByteBuffer +class TC_SHARED_API ByteBuffer { public: static size_t const DEFAULT_SIZE = 0x1000;