From e201c034c732e2a7cd6c2fb1fb1726e1b58019a7 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 12 Aug 2016 11:58:18 +0200 Subject: [PATCH] Core/Common: Converted the common library to a shared library. * There is still the possibility to static link against common. --- src/common/Collision/Management/MMapManager.h | 2 +- src/common/Collision/VMapTools.h | 2 +- src/common/Common.cpp | 2 +- src/common/Common.h | 2 +- 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 824153c5fe3..54990d5926a 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -61,7 +61,7 @@ namespace MMAP typedef std::unordered_map TerrainSetMap; - class MMapData + class TC_COMMON_API MMapData { public: MMapData(dtNavMesh* mesh, uint32 mapId); 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 0974bf38a41..17a83cec58a 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 bf2950e6344..576cbcfe912 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -136,7 +136,7 @@ const uint8 OLD_TOTAL_LOCALES = 9; /// @todo convert in simple system #define MAX_LOCALES 10 #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 9812039aa24..ff8a6ba10c8 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -356,7 +356,7 @@ class HookList } }; -class flag96 +class TC_COMMON_API flag96 { private: uint32 part[3];