Browse Source

Using Corrade's visibility macros instead of copypasta all over again.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
f2df328fe2
  1. 12
      src/DebugTools/magnumDebugToolsVisibility.h
  2. 12
      src/MeshTools/magnumMeshToolsVisibility.h
  3. 12
      src/Physics/magnumPhysicsVisibility.h
  4. 12
      src/Primitives/magnumPrimitivesVisibility.h
  5. 15
      src/SceneGraph/magnumSceneGraphVisibility.h
  6. 12
      src/Shaders/magnumShadersVisibility.h
  7. 15
      src/Text/magnumTextVisibility.h
  8. 12
      src/TextureTools/magnumTextureToolsVisibility.h
  9. 15
      src/magnumVisibility.h

12
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 <Utility/Visibility.h>
#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

12
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 <Utility/Visibility.h>
#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

12
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 <Utility/Visibility.h>
#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

12
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 <Utility/Visibility.h>
#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

15
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 <Utility/Visibility.h>
#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

12
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 <Utility/Visibility.h>
#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

15
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 <Utility/Visibility.h>
#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

12
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 <Utility/Visibility.h>
#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

15
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 <Utility/Visibility.h>
#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

Loading…
Cancel
Save