Browse Source

Fix static build on Windows.

pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
f86a60c82d
  1. 12
      src/Audio/magnumAudioVisibility.h
  2. 12
      src/DebugTools/magnumDebugToolsVisibility.h
  3. 12
      src/MeshTools/magnumMeshToolsVisibility.h
  4. 10
      src/Plugins/TgaImageConverter/TgaImageConverter.h
  5. 10
      src/Plugins/TgaImporter/TgaImporter.h
  6. 12
      src/Primitives/magnumPrimitivesVisibility.h
  7. 12
      src/SceneGraph/magnumSceneGraphVisibility.h
  8. 12
      src/Shaders/magnumShadersVisibility.h
  9. 12
      src/Shapes/magnumShapesVisibility.h
  10. 12
      src/Text/magnumTextVisibility.h
  11. 12
      src/TextureTools/magnumTextureToolsVisibility.h
  12. 12
      src/magnumVisibility.h

12
src/Audio/magnumAudioVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/DebugTools/magnumDebugToolsVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/MeshTools/magnumMeshToolsVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

10
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

10
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

12
src/Primitives/magnumPrimitivesVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/SceneGraph/magnumSceneGraphVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/Shaders/magnumShadersVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/Shapes/magnumShapesVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/Text/magnumTextVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/TextureTools/magnumTextureToolsVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

12
src/magnumVisibility.h

@ -26,10 +26,16 @@
#include <Utility/Visibility.h>
#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

Loading…
Cancel
Save