diff --git a/src/Audio/magnumAudioVisibility.h b/src/Audio/magnumAudioVisibility.h index e4a7c0f67..cc4600394 100644 --- a/src/Audio/magnumAudioVisibility.h +++ b/src/Audio/magnumAudioVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumAudio_EXPORTS - #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumAudio_EXPORTS + #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_STATIC #endif #endif diff --git a/src/DebugTools/magnumDebugToolsVisibility.h b/src/DebugTools/magnumDebugToolsVisibility.h index d08f88d14..2499c5d24 100644 --- a/src/DebugTools/magnumDebugToolsVisibility.h +++ b/src/DebugTools/magnumDebugToolsVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumDebugTools_EXPORTS - #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumDebugTools_EXPORTS + #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_STATIC #endif #endif diff --git a/src/MeshTools/magnumMeshToolsVisibility.h b/src/MeshTools/magnumMeshToolsVisibility.h index f7d8a63c4..476d8f3a5 100644 --- a/src/MeshTools/magnumMeshToolsVisibility.h +++ b/src/MeshTools/magnumMeshToolsVisibility.h @@ -26,10 +26,16 @@ #include -#if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) - #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) + #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_STATIC #endif #endif diff --git a/src/Plugins/TgaImageConverter/TgaImageConverter.h b/src/Plugins/TgaImageConverter/TgaImageConverter.h index 7acaa4dfd..1b5e9e02e 100644 --- a/src/Plugins/TgaImageConverter/TgaImageConverter.h +++ b/src/Plugins/TgaImageConverter/TgaImageConverter.h @@ -31,10 +31,14 @@ #include "Trade/AbstractImageConverter.h" #ifndef DOXYGEN_GENERATING_OUTPUT -#if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS) - #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_EXPORT +#ifndef MAGNUM_BUILD_STATIC + #if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS) + #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL #endif diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/Plugins/TgaImporter/TgaImporter.h index 826fb5197..dfdcfc5b5 100644 --- a/src/Plugins/TgaImporter/TgaImporter.h +++ b/src/Plugins/TgaImporter/TgaImporter.h @@ -33,10 +33,14 @@ #include "Trade/AbstractImporter.h" #ifndef DOXYGEN_GENERATING_OUTPUT -#if defined(TgaImporter_EXPORTS) || defined(TgaImporterObjects_EXPORTS) - #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT +#ifndef MAGNUM_BUILD_STATIC + #if defined(TgaImporter_EXPORTS) || defined(TgaImporterObjects_EXPORTS) + #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_TRADE_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL #endif diff --git a/src/Primitives/magnumPrimitivesVisibility.h b/src/Primitives/magnumPrimitivesVisibility.h index 0acf6cf82..770730353 100644 --- a/src/Primitives/magnumPrimitivesVisibility.h +++ b/src/Primitives/magnumPrimitivesVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumPrimitives_EXPORTS - #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumPrimitives_EXPORTS + #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_STATIC #endif #endif diff --git a/src/SceneGraph/magnumSceneGraphVisibility.h b/src/SceneGraph/magnumSceneGraphVisibility.h index 366634198..9ffc7422c 100644 --- a/src/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/SceneGraph/magnumSceneGraphVisibility.h @@ -26,10 +26,16 @@ #include -#if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) - #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) + #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_SCENEGRAPH_LOCAL CORRADE_VISIBILITY_LOCAL diff --git a/src/Shaders/magnumShadersVisibility.h b/src/Shaders/magnumShadersVisibility.h index 93c270176..a42810511 100644 --- a/src/Shaders/magnumShadersVisibility.h +++ b/src/Shaders/magnumShadersVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumShaders_EXPORTS - #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumShaders_EXPORTS + #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_STATIC #endif #endif diff --git a/src/Shapes/magnumShapesVisibility.h b/src/Shapes/magnumShapesVisibility.h index c5f8fa30f..2af59f9b8 100644 --- a/src/Shapes/magnumShapesVisibility.h +++ b/src/Shapes/magnumShapesVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumShapes_EXPORTS - #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumShapes_EXPORTS + #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_SHAPES_LOCAL CORRADE_VISIBILITY_LOCAL diff --git a/src/Text/magnumTextVisibility.h b/src/Text/magnumTextVisibility.h index b69855471..c15adef5a 100644 --- a/src/Text/magnumTextVisibility.h +++ b/src/Text/magnumTextVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumText_EXPORTS - #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumText_EXPORTS + #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_TEXT_LOCAL CORRADE_VISIBILITY_LOCAL diff --git a/src/TextureTools/magnumTextureToolsVisibility.h b/src/TextureTools/magnumTextureToolsVisibility.h index 30f40eb1c..c552e907d 100644 --- a/src/TextureTools/magnumTextureToolsVisibility.h +++ b/src/TextureTools/magnumTextureToolsVisibility.h @@ -26,10 +26,16 @@ #include -#ifdef MagnumTextureTools_EXPORTS - #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #ifdef MagnumTextureTools_EXPORTS + #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_STATIC #endif #endif diff --git a/src/magnumVisibility.h b/src/magnumVisibility.h index 09ac087ed..d85a39fff 100644 --- a/src/magnumVisibility.h +++ b/src/magnumVisibility.h @@ -26,10 +26,16 @@ #include -#if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) || defined(MagnumMathObjects_EXPORTS) - #define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT +#include "magnumConfigure.h" + +#ifndef MAGNUM_BUILD_STATIC + #if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) || defined(MagnumMathObjects_EXPORTS) + #define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT + #else + #define MAGNUM_EXPORT CORRADE_VISIBILITY_IMPORT + #endif #else - #define MAGNUM_EXPORT CORRADE_VISIBILITY_IMPORT + #define MAGNUM_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_LOCAL CORRADE_VISIBILITY_LOCAL