X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fthird_party%2FPluma%2FConfig.hpp;h=2fa7df5a21627b5ad983ffc12e1f75cba07f9924;hb=35d769c683c10f5c18d17a3e423d89f5b30a5b77;hp=efd98c93186d754106e8fe01b8e7ace4da66895c;hpb=8c23766af88a29c3e830299dffc4b95d9fe61df9;p=cpPlugins.git diff --git a/lib/third_party/Pluma/Config.hpp b/lib/third_party/Pluma/Config.hpp index efd98c9..2fa7df5 100644 --- a/lib/third_party/Pluma/Config.hpp +++ b/lib/third_party/Pluma/Config.hpp @@ -95,47 +95,52 @@ //////////////////////////////////////////////////////////// // Define portable import / export macros //////////////////////////////////////////////////////////// -#if defined(PLUMA_SYS_WINDOWS) - #ifndef PLUMA_STATIC +#include +#define PLUMA_API cpPlugins_Pluma_EXPORT - // Windows platforms - #ifdef PLUMA_EXPORTS +/* =================================================================== + * florez-l@javeriana.edu.co: use dll macro defined from cmake instead + * =================================================================== + #if defined(PLUMA_SYS_WINDOWS) - // From DLL side, we must export - #define PLUMA_API __declspec(dllexport) + #ifndef PLUMA_STATIC - #else + // Windows platforms + #ifdef PLUMA_EXPORTS - // From client application side, we must import - #define PLUMA_API __declspec(dllimport) + // From DLL side, we must export + #define PLUMA_API __declspec(dllexport) - #endif + #else - // For Visual C++ compilers, we also need to turn off this annoying C4251 warning. - // You can read lots ot different things about it, but the point is the code will - // just work fine, and so the simplest way to get rid of this warning is to disable it - #ifdef _MSC_VER + // From client application side, we must import + #define PLUMA_API __declspec(dllimport) - #pragma warning(disable : 4251) + #endif - #endif + // For Visual C++ compilers, we also need to turn off this annoying C4251 warning. + // You can read lots ot different things about it, but the point is the code will + // just work fine, and so the simplest way to get rid of this warning is to disable it + #ifdef _MSC_VER - #else + #pragma warning(disable : 4251) - // No specific directive needed for static build - #define PLUMA_API + #endif - #endif - -#else + #else - // Other platforms don't need to define anything - #define PLUMA_API + // No specific directive needed for static build + #define PLUMA_API -#endif + #endif + #else + // Other platforms don't need to define anything + #define PLUMA_API + #endif +*/ #endif // PLUMA_CONFIG_HPP