From f2df328fe2948943858c40bf3bf29869c40003ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 19 Apr 2013 13:10:09 +0200 Subject: [PATCH] Using Corrade's visibility macros instead of copypasta all over again. --- src/DebugTools/magnumDebugToolsVisibility.h | 12 +++++------- src/MeshTools/magnumMeshToolsVisibility.h | 12 +++++------- src/Physics/magnumPhysicsVisibility.h | 12 +++++------- src/Primitives/magnumPrimitivesVisibility.h | 12 +++++------- src/SceneGraph/magnumSceneGraphVisibility.h | 15 ++++++--------- src/Shaders/magnumShadersVisibility.h | 12 +++++------- src/Text/magnumTextVisibility.h | 15 ++++++--------- src/TextureTools/magnumTextureToolsVisibility.h | 12 +++++------- src/magnumVisibility.h | 15 ++++++--------- 9 files changed, 48 insertions(+), 69 deletions(-) diff --git a/src/DebugTools/magnumDebugToolsVisibility.h b/src/DebugTools/magnumDebugToolsVisibility.h index 46eda28fd..d08f88d14 100644 --- a/src/DebugTools/magnumDebugToolsVisibility.h +++ b/src/DebugTools/magnumDebugToolsVisibility.h @@ -24,14 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #ifdef MagnumDebugTools_EXPORTS - #define MAGNUM_DEBUGTOOLS_EXPORT __declspec(dllexport) - #else - #define MAGNUM_DEBUGTOOLS_EXPORT __declspec(dllimport) - #endif +#include + +#ifdef MagnumDebugTools_EXPORTS + #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_DEBUGTOOLS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT #endif #endif diff --git a/src/MeshTools/magnumMeshToolsVisibility.h b/src/MeshTools/magnumMeshToolsVisibility.h index 2c4934962..f7d8a63c4 100644 --- a/src/MeshTools/magnumMeshToolsVisibility.h +++ b/src/MeshTools/magnumMeshToolsVisibility.h @@ -24,14 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) - #define MAGNUM_MESHTOOLS_EXPORT __declspec(dllexport) - #else - #define MAGNUM_MESHTOOLS_EXPORT __declspec(dllimport) - #endif +#include + +#if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) + #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_MESHTOOLS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT #endif #endif diff --git a/src/Physics/magnumPhysicsVisibility.h b/src/Physics/magnumPhysicsVisibility.h index 07d22128b..6ee2b89c0 100644 --- a/src/Physics/magnumPhysicsVisibility.h +++ b/src/Physics/magnumPhysicsVisibility.h @@ -24,14 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #ifdef MagnumPhysics_EXPORTS - #define MAGNUM_PHYSICS_EXPORT __declspec(dllexport) - #else - #define MAGNUM_PHYSICS_EXPORT __declspec(dllimport) - #endif +#include + +#ifdef MagnumPhysics_EXPORTS + #define MAGNUM_PHYSICS_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_PHYSICS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_PHYSICS_EXPORT CORRADE_VISIBILITY_IMPORT #endif #endif diff --git a/src/Primitives/magnumPrimitivesVisibility.h b/src/Primitives/magnumPrimitivesVisibility.h index 13a5c93cb..0acf6cf82 100644 --- a/src/Primitives/magnumPrimitivesVisibility.h +++ b/src/Primitives/magnumPrimitivesVisibility.h @@ -24,14 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #ifdef MagnumPrimitives_EXPORTS - #define MAGNUM_PRIMITIVES_EXPORT __declspec(dllexport) - #else - #define MAGNUM_PRIMITIVES_EXPORT __declspec(dllimport) - #endif +#include + +#ifdef MagnumPrimitives_EXPORTS + #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_PRIMITIVES_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_IMPORT #endif #endif diff --git a/src/SceneGraph/magnumSceneGraphVisibility.h b/src/SceneGraph/magnumSceneGraphVisibility.h index b4b023eef..366634198 100644 --- a/src/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/SceneGraph/magnumSceneGraphVisibility.h @@ -24,16 +24,13 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) - #define MAGNUM_SCENEGRAPH_EXPORT __declspec(dllexport) - #else - #define MAGNUM_SCENEGRAPH_EXPORT __declspec(dllimport) - #endif - #define MAGNUM_SCENEGRAPH_LOCAL +#include + +#if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) + #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_SCENEGRAPH_EXPORT __attribute__ ((visibility ("default"))) - #define MAGNUM_SCENEGRAPH_LOCAL __attribute__ ((visibility ("hidden"))) + #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_IMPORT #endif +#define MAGNUM_SCENEGRAPH_LOCAL CORRADE_VISIBILITY_LOCAL #endif diff --git a/src/Shaders/magnumShadersVisibility.h b/src/Shaders/magnumShadersVisibility.h index 238ddeb04..93c270176 100644 --- a/src/Shaders/magnumShadersVisibility.h +++ b/src/Shaders/magnumShadersVisibility.h @@ -24,14 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #ifdef MagnumShaders_EXPORTS - #define MAGNUM_SHADERS_EXPORT __declspec(dllexport) - #else - #define MAGNUM_SHADERS_EXPORT __declspec(dllimport) - #endif +#include + +#ifdef MagnumShaders_EXPORTS + #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_SHADERS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_IMPORT #endif #endif diff --git a/src/Text/magnumTextVisibility.h b/src/Text/magnumTextVisibility.h index a5608044a..b69855471 100644 --- a/src/Text/magnumTextVisibility.h +++ b/src/Text/magnumTextVisibility.h @@ -24,16 +24,13 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #ifdef MagnumText_EXPORTS - #define MAGNUM_TEXT_EXPORT __declspec(dllexport) - #else - #define MAGNUM_TEXT_EXPORT __declspec(dllimport) - #endif - #define MAGNUM_TEXT_LOCAL +#include + +#ifdef MagnumText_EXPORTS + #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_TEXT_EXPORT __attribute__ ((visibility ("default"))) - #define MAGNUM_TEXT_LOCAL __attribute__ ((visibility ("hidden"))) + #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_IMPORT #endif +#define MAGNUM_TEXT_LOCAL CORRADE_VISIBILITY_LOCAL #endif diff --git a/src/TextureTools/magnumTextureToolsVisibility.h b/src/TextureTools/magnumTextureToolsVisibility.h index ad0dbb333..30f40eb1c 100644 --- a/src/TextureTools/magnumTextureToolsVisibility.h +++ b/src/TextureTools/magnumTextureToolsVisibility.h @@ -24,14 +24,12 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #ifdef MagnumTextureTools_EXPORTS - #define MAGNUM_TEXTURETOOLS_EXPORT __declspec(dllexport) - #else - #define MAGNUM_TEXTURETOOLS_EXPORT __declspec(dllimport) - #endif +#include + +#ifdef MagnumTextureTools_EXPORTS + #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_TEXTURETOOLS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_IMPORT #endif #endif diff --git a/src/magnumVisibility.h b/src/magnumVisibility.h index c23a8066b..60e1f8cca 100644 --- a/src/magnumVisibility.h +++ b/src/magnumVisibility.h @@ -24,16 +24,13 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef _WIN32 - #if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) - #define MAGNUM_EXPORT __declspec(dllexport) - #else - #define MAGNUM_EXPORT __declspec(dllimport) - #endif - #define MAGNUM_LOCAL +#include + +#if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) + #define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT #else - #define MAGNUM_EXPORT __attribute__ ((visibility ("default"))) - #define MAGNUM_LOCAL __attribute__ ((visibility ("hidden"))) + #define MAGNUM_EXPORT CORRADE_VISIBILITY_IMPORT #endif +#define MAGNUM_LOCAL CORRADE_VISIBILITY_LOCAL #endif