ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix static build on Windows.

pull/34/head
Vladimír Vondruš 13 years ago
parent
9b6b4377e9
commit
f86a60c82d
12 changed files with 104 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Audio/magnumAudioVisibility.h
  2. 6
      src/DebugTools/magnumDebugToolsVisibility.h
  3. 6
      src/MeshTools/magnumMeshToolsVisibility.h
  4. 4
      src/Plugins/TgaImageConverter/TgaImageConverter.h
  5. 4
      src/Plugins/TgaImporter/TgaImporter.h
  6. 6
      src/Primitives/magnumPrimitivesVisibility.h
  7. 6
      src/SceneGraph/magnumSceneGraphVisibility.h
  8. 6
      src/Shaders/magnumShadersVisibility.h
  9. 6
      src/Shapes/magnumShapesVisibility.h
  10. 6
      src/Text/magnumTextVisibility.h
  11. 6
      src/TextureTools/magnumTextureToolsVisibility.h
  12. 6
      src/magnumVisibility.h

6
src/Audio/magnumAudioVisibility.h
Unescape View File

@ -26,10 +26,16 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumAudio_EXPORTS #ifdef MagnumAudio_EXPORTS
#define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#endif #endif

6
src/DebugTools/magnumDebugToolsVisibility.h
Unescape View File

@ -26,10 +26,16 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumDebugTools_EXPORTS #ifdef MagnumDebugTools_EXPORTS
#define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#endif #endif

6
src/MeshTools/magnumMeshToolsVisibility.h
Unescape View File

@ -26,10 +26,16 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS)
#define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#endif #endif

4
src/Plugins/TgaImageConverter/TgaImageConverter.h
Unescape View File

@ -31,11 +31,15 @@
#include "Trade/AbstractImageConverter.h" #include "Trade/AbstractImageConverter.h"
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_BUILD_STATIC
#if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS) #if defined(TgaImageConverter_EXPORTS) || defined(TgaImageConverterObjects_EXPORTS)
#define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_TRADE_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_TRADE_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif

4
src/Plugins/TgaImporter/TgaImporter.h
Unescape View File

@ -33,11 +33,15 @@
#include "Trade/AbstractImporter.h" #include "Trade/AbstractImporter.h"
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_BUILD_STATIC
#if defined(TgaImporter_EXPORTS) || defined(TgaImporterObjects_EXPORTS) #if defined(TgaImporter_EXPORTS) || defined(TgaImporterObjects_EXPORTS)
#define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_TRADE_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_TRADE_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_TRADE_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif

6
src/Primitives/magnumPrimitivesVisibility.h
Unescape View File

@ -26,10 +26,16 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumPrimitives_EXPORTS #ifdef MagnumPrimitives_EXPORTS
#define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#endif #endif

6
src/SceneGraph/magnumSceneGraphVisibility.h
Unescape View File

@ -26,11 +26,17 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS)
#define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_SCENEGRAPH_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_SCENEGRAPH_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif

6
src/Shaders/magnumShadersVisibility.h
Unescape View File

@ -26,10 +26,16 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumShaders_EXPORTS #ifdef MagnumShaders_EXPORTS
#define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#endif #endif

6
src/Shapes/magnumShapesVisibility.h
Unescape View File

@ -26,11 +26,17 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumShapes_EXPORTS #ifdef MagnumShapes_EXPORTS
#define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_SHAPES_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_SHAPES_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif

6
src/Text/magnumTextVisibility.h
Unescape View File

@ -26,11 +26,17 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumText_EXPORTS #ifdef MagnumText_EXPORTS
#define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_TEXT_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_TEXT_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif

6
src/TextureTools/magnumTextureToolsVisibility.h
Unescape View File

@ -26,10 +26,16 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#ifdef MagnumTextureTools_EXPORTS #ifdef MagnumTextureTools_EXPORTS
#define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_TEXTURETOOLS_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#endif #endif

6
src/magnumVisibility.h
Unescape View File

@ -26,11 +26,17 @@
#include <Utility/Visibility.h> #include <Utility/Visibility.h>
#include "magnumConfigure.h"
#ifndef MAGNUM_BUILD_STATIC
#if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) || defined(MagnumMathObjects_EXPORTS) #if defined(Magnum_EXPORTS) || defined(MagnumObjects_EXPORTS) || defined(MagnumMathObjects_EXPORTS)
#define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT #define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT
#else #else
#define MAGNUM_EXPORT CORRADE_VISIBILITY_IMPORT #define MAGNUM_EXPORT CORRADE_VISIBILITY_IMPORT
#endif #endif
#else
#define MAGNUM_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_LOCAL CORRADE_VISIBILITY_LOCAL #define MAGNUM_LOCAL CORRADE_VISIBILITY_LOCAL
#endif #endif

Write Preview
Loading…
Cancel
Save