diff options
author | Naios <naios-dev@live.de> | 2016-03-11 16:01:32 +0100 |
---|---|---|
committer | Naios <naios-dev@live.de> | 2016-03-24 01:29:00 +0100 |
commit | 25b0e743b1a823b636ffc1ba17062f8d5ebe35ab (patch) | |
tree | b09c015a89e0c10281681e9fb3f93785cd07134d | |
parent | 6cfea2d8f7de3de8206a1f4cf23a6d653814afe1 (diff) |
Core/Shared: Converted the shared library to a shared library ,-).
* There is still the possibility to static link against shared.
-rw-r--r-- | src/server/shared/CMakeLists.txt | 14 | ||||
-rw-r--r-- | src/server/shared/DataStores/DB2StorageLoader.h | 4 | ||||
-rw-r--r-- | src/server/shared/DataStores/DBCFileLoader.h | 2 | ||||
-rw-r--r-- | src/server/shared/Packets/ByteBuffer.h | 8 | ||||
-rw-r--r-- | src/server/shared/Realm/Realm.h | 4 |
5 files changed, 23 insertions, 9 deletions
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index fec92c842a5..ce6c13bd932 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -21,6 +21,8 @@ endif() GroupSources(${CMAKE_CURRENT_SOURCE_DIR}) +add_definitions(-DTRINITY_API_EXPORT_SHARED) + add_library(shared ${PRIVATE_SOURCES} ${PRIVATE_PCH_SOURCE} @@ -48,6 +50,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/DB2StorageLoader.h b/src/server/shared/DataStores/DB2StorageLoader.h index 0b83bc43dc4..41705c67f19 100644 --- a/src/server/shared/DataStores/DB2StorageLoader.h +++ b/src/server/shared/DataStores/DB2StorageLoader.h @@ -24,7 +24,7 @@ #include <cassert> #include <list> -class DB2FileLoader +class TC_SHARED_API DB2FileLoader { public: DB2FileLoader(); @@ -114,7 +114,7 @@ private: int unk5; // WDB2 }; -class DB2DatabaseLoader +class TC_SHARED_API DB2DatabaseLoader { public: explicit DB2DatabaseLoader(std::string const& storageName) : _storageName(storageName) { } diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h index cbbd786337c..e58031e6ccc 100644 --- a/src/server/shared/DataStores/DBCFileLoader.h +++ b/src/server/shared/DataStores/DBCFileLoader.h @@ -23,7 +23,7 @@ #include "Utilities/ByteConverter.h" #include <cassert> -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 b8c6ee1c36e..2373e632c44 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -37,7 +37,7 @@ class MessageBuffer; // Root of ByteBuffer exception hierarchy -class ByteBufferException : public std::exception +class TC_SHARED_API ByteBufferException : public std::exception { public: ~ByteBufferException() throw() { } @@ -51,7 +51,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: ~ByteBufferPositionException() throw() { } }; -class ByteBufferSourceException : public ByteBufferException +class TC_SHARED_API ByteBufferSourceException : public ByteBufferException { public: ByteBufferSourceException(size_t pos, size_t size, size_t valueSize); @@ -67,7 +67,7 @@ public: ~ByteBufferSourceException() throw() { } }; -class ByteBuffer +class TC_SHARED_API ByteBuffer { public: static size_t const DEFAULT_SIZE = 0x1000; diff --git a/src/server/shared/Realm/Realm.h b/src/server/shared/Realm/Realm.h index 585a98e4569..87d333a4bf6 100644 --- a/src/server/shared/Realm/Realm.h +++ b/src/server/shared/Realm/Realm.h @@ -41,7 +41,7 @@ enum RealmFlags namespace Battlenet { - struct RealmHandle + struct TC_SHARED_API RealmHandle { RealmHandle() : Region(0), Site(0), Realm(0) { } RealmHandle(uint8 region, uint8 battlegroup, uint32 index) @@ -78,7 +78,7 @@ enum RealmType }; // Storage object for a realm -struct Realm +struct TC_SHARED_API Realm { Battlenet::RealmHandle Id; uint32 Build; |