diff options
author | Naios <naios-dev@live.de> | 2016-03-22 19:58:32 +0100 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2016-08-08 18:00:32 +0200 |
commit | 68015599dcbc3a15f2cca8562cab606f45a95d15 (patch) | |
tree | 61c0e269b66146eb67b95230260d26ff2655aee7 /src | |
parent | fdd78d20772701b3e0fd7caf0da2cd5a2e6b6354 (diff) |
Core/Common: Converted the common library to a shared library.
* There is still the possibility to static link against common.
(cherry picked from commit 501fd9b50232ca3ae3623877c3e521c9c1f894be)
# Conflicts:
# src/common/Collision/Management/MMapManager.h
# src/common/Collision/VMapTools.h
# src/common/Common.cpp
# src/common/Common.h
# src/common/Cryptography/Authentication/PacketCrypt.h
# src/common/Cryptography/Authentication/WorldPacketCrypt.h
# src/common/Cryptography/HmacHash.cpp
# src/common/Cryptography/HmacHash.h
# src/common/Cryptography/SHA256.h
# src/common/GitRevision.h
# src/common/Utilities/Random.h
# src/common/Utilities/Util.h
Diffstat (limited to 'src')
-rw-r--r-- | src/common/Collision/Management/MMapManager.h | 2 | ||||
-rw-r--r-- | src/common/Collision/VMapTools.h | 2 | ||||
-rw-r--r-- | src/common/Common.cpp | 2 | ||||
-rw-r--r-- | src/common/Common.h | 2 | ||||
-rw-r--r-- | src/common/Utilities/Util.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index 0b85351f6a5..6e2594a1d7f 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -33,7 +33,7 @@ namespace MMAP typedef std::unordered_map<uint32, dtNavMeshQuery*> NavMeshQuerySet; // dummy struct to hold map's mmap data - struct MMapData + struct TC_COMMON_API MMapData { MMapData(dtNavMesh* mesh) : navMesh(mesh) { } ~MMapData() diff --git a/src/common/Collision/VMapTools.h b/src/common/Collision/VMapTools.h index a7e4149b516..85f0cc13415 100644 --- a/src/common/Collision/VMapTools.h +++ b/src/common/Collision/VMapTools.h @@ -46,7 +46,7 @@ namespace VMAP //============================================================== //============================================================== - class MyCollisionDetection + class TC_COMMON_API MyCollisionDetection { private: public: diff --git a/src/common/Common.cpp b/src/common/Common.cpp index 308da602579..d2b3c9c8234 100644 --- a/src/common/Common.cpp +++ b/src/common/Common.cpp @@ -18,7 +18,7 @@ #include "Common.h" -char const* localeNames[TOTAL_LOCALES] = { +TC_COMMON_API char const* localeNames[TOTAL_LOCALES] = { "enUS", "koKR", "frFR", diff --git a/src/common/Common.h b/src/common/Common.h index aa04abacd30..423c3e8cae0 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -133,7 +133,7 @@ enum LocaleConstant #define MAX_LOCALES 8 #define MAX_ACCOUNT_TUTORIAL_VALUES 8 -TC_COMMON_API extern char const* localeNames[TOTAL_LOCALES]; +extern "C" TC_COMMON_API char const* localeNames[TOTAL_LOCALES]; TC_COMMON_API LocaleConstant GetLocaleByName(const std::string& name); diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 3ea2a87d985..fc322a89583 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -357,7 +357,7 @@ class HookList } }; -class flag96 +class TC_COMMON_API flag96 { private: uint32 part[3]; |