diff --git a/src/MeshTools/CompressIndices.h b/src/MeshTools/CompressIndices.h index e9bf40c9e..34ccb7991 100644 --- a/src/MeshTools/CompressIndices.h +++ b/src/MeshTools/CompressIndices.h @@ -31,7 +31,7 @@ namespace Magnum { namespace MeshTools { #ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { -class MESHTOOLS_EXPORT CompressIndices { +class MAGNUM_MESHTOOLS_EXPORT CompressIndices { public: CompressIndices(const std::vector& indices): indices(indices) {} diff --git a/src/MeshTools/FlipNormals.h b/src/MeshTools/FlipNormals.h index c113e908d..98d71eb08 100644 --- a/src/MeshTools/FlipNormals.h +++ b/src/MeshTools/FlipNormals.h @@ -34,7 +34,7 @@ namespace Magnum { namespace MeshTools { The same as flipNormals(std::vector&, std::vector&), but flips only face winding. */ -void MESHTOOLS_EXPORT flipFaceWinding(std::vector& indices); +void MAGNUM_MESHTOOLS_EXPORT flipFaceWinding(std::vector& indices); /** @brief Flip mesh normals @@ -42,7 +42,7 @@ void MESHTOOLS_EXPORT flipFaceWinding(std::vector& indices); The same as flipNormals(std::vector&, std::vector&), but flips only normals, not face winding. */ -void MESHTOOLS_EXPORT flipNormals(std::vector& normals); +void MAGNUM_MESHTOOLS_EXPORT flipNormals(std::vector& normals); /** @brief Flip mesh normals and face winding diff --git a/src/MeshTools/GenerateFlatNormals.h b/src/MeshTools/GenerateFlatNormals.h index 2e23dfa5e..35a6e8047 100644 --- a/src/MeshTools/GenerateFlatNormals.h +++ b/src/MeshTools/GenerateFlatNormals.h @@ -51,7 +51,7 @@ use the same indices. @attention Index count must be divisible by 3, otherwise zero length result is generated. */ -std::tuple, std::vector> MESHTOOLS_EXPORT generateFlatNormals(const std::vector& indices, const std::vector& positions); +std::tuple, std::vector> MAGNUM_MESHTOOLS_EXPORT generateFlatNormals(const std::vector& indices, const std::vector& positions); }} diff --git a/src/MeshTools/Tipsify.h b/src/MeshTools/Tipsify.h index ca93c1297..69d65082e 100644 --- a/src/MeshTools/Tipsify.h +++ b/src/MeshTools/Tipsify.h @@ -29,7 +29,7 @@ namespace Magnum { namespace MeshTools { #ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { -class MESHTOOLS_EXPORT Tipsify { +class MAGNUM_MESHTOOLS_EXPORT Tipsify { public: inline Tipsify(std::vector& indices, std::uint32_t vertexCount): indices(indices), vertexCount(vertexCount) {} diff --git a/src/MeshTools/magnumMeshToolsVisibility.h b/src/MeshTools/magnumMeshToolsVisibility.h index 61b0a0d39..ebef4ae43 100644 --- a/src/MeshTools/magnumMeshToolsVisibility.h +++ b/src/MeshTools/magnumMeshToolsVisibility.h @@ -17,12 +17,12 @@ #ifdef _WIN32 #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) - #define MESHTOOLS_EXPORT __declspec(dllexport) + #define MAGNUM_MESHTOOLS_EXPORT __declspec(dllexport) #else - #define MESHTOOLS_EXPORT __declspec(dllimport) + #define MAGNUM_MESHTOOLS_EXPORT __declspec(dllimport) #endif #else - #define MESHTOOLS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_MESHTOOLS_EXPORT __attribute__ ((visibility ("default"))) #endif #endif diff --git a/src/Physics/AbstractShape.h b/src/Physics/AbstractShape.h index c4e6dff67..44fa0af6a 100644 --- a/src/Physics/AbstractShape.h +++ b/src/Physics/AbstractShape.h @@ -65,7 +65,7 @@ namespace Implementation { See @ref collision-detection for brief introduction. @see AbstractShape2D, AbstractShape3D */ -template class PHYSICS_EXPORT AbstractShape { +template class MAGNUM_PHYSICS_EXPORT AbstractShape { public: /** @brief Dimension count */ static const std::uint8_t Dimensions = dimensions; @@ -126,8 +126,8 @@ typedef AbstractShape<3> AbstractShape3D; /** @debugoperator{Magnum::Physics::AbstractShape} */ #ifndef DOXYGEN_GENERATING_OUTPUT -Debug PHYSICS_EXPORT operator<<(Debug debug, AbstractShape2D::Type value); -Debug PHYSICS_EXPORT operator<<(Debug debug, AbstractShape3D::Type value); +Debug MAGNUM_PHYSICS_EXPORT operator<<(Debug debug, AbstractShape2D::Type value); +Debug MAGNUM_PHYSICS_EXPORT operator<<(Debug debug, AbstractShape3D::Type value); #else template Debug operator<<(Debug debug, typename AbstractShape::Type value); #endif diff --git a/src/Physics/AxisAlignedBox.h b/src/Physics/AxisAlignedBox.h index 2c00e8f35..6d76e7da5 100644 --- a/src/Physics/AxisAlignedBox.h +++ b/src/Physics/AxisAlignedBox.h @@ -31,7 +31,7 @@ namespace Magnum { namespace Physics { @see AxisAlignedBox2D, AxisAlignedBox3D */ -template class PHYSICS_EXPORT AxisAlignedBox: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT AxisAlignedBox: public AbstractShape { public: /** @brief Constructor */ inline AxisAlignedBox(const typename DimensionTraits::VectorType& position, const typename DimensionTraits::VectorType& size): _position(position), _transformedPosition(position), _size(size), _transformedSize(size) {} diff --git a/src/Physics/Box.h b/src/Physics/Box.h index 87f259a12..f09e093b2 100644 --- a/src/Physics/Box.h +++ b/src/Physics/Box.h @@ -33,7 +33,7 @@ namespace Magnum { namespace Physics { @todo Use quat + position + size instead? @see Box2D, Box3D */ -template class PHYSICS_EXPORT Box: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT Box: public AbstractShape { public: /** @brief Constructor */ inline Box(const typename DimensionTraits::MatrixType& transformation): _transformation(transformation), _transformedTransformation(transformation) {} diff --git a/src/Physics/Capsule.h b/src/Physics/Capsule.h index 3c5aad2d6..015050ffe 100644 --- a/src/Physics/Capsule.h +++ b/src/Physics/Capsule.h @@ -34,7 +34,7 @@ Unlike other elements the capsule doesn't support asymmetric scaling. When applying transformation, the scale factor is averaged from all axes. @see Capsule2D, Capsule3D */ -template class PHYSICS_EXPORT Capsule: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT Capsule: public AbstractShape { public: /** @brief Constructor */ inline Capsule(const typename DimensionTraits::VectorType& a, const typename DimensionTraits::VectorType& b, float radius): _a(a), _transformedA(a), _b(b), _transformedB(b), _radius(radius), _transformedRadius(radius) {} diff --git a/src/Physics/DebugDrawResourceManager.cpp b/src/Physics/DebugDrawResourceManager.cpp index 8e958bc57..ba2560e02 100644 --- a/src/Physics/DebugDrawResourceManager.cpp +++ b/src/Physics/DebugDrawResourceManager.cpp @@ -43,8 +43,8 @@ template SceneGraph::Drawable* DebugDrawRes return renderer; } -template SceneGraph::Drawable<2> PHYSICS_EXPORT * DebugDrawResourceManager::createDebugRenderer(ObjectShape<2>* shape, ResourceKey options); -template SceneGraph::Drawable<3> PHYSICS_EXPORT * DebugDrawResourceManager::createDebugRenderer(ObjectShape<3>* shape, ResourceKey options); +template SceneGraph::Drawable<2> MAGNUM_PHYSICS_EXPORT * DebugDrawResourceManager::createDebugRenderer(ObjectShape<2>* shape, ResourceKey options); +template SceneGraph::Drawable<3> MAGNUM_PHYSICS_EXPORT * DebugDrawResourceManager::createDebugRenderer(ObjectShape<3>* shape, ResourceKey options); void DebugDrawResourceManager::createDebugMesh(Implementation::DebugRenderer<2>* renderer, AbstractShape2D* shape) { switch(shape->type()) { diff --git a/src/Physics/DebugDrawResourceManager.h b/src/Physics/DebugDrawResourceManager.h index d7a2fff44..ffabe9350 100644 --- a/src/Physics/DebugDrawResourceManager.h +++ b/src/Physics/DebugDrawResourceManager.h @@ -43,7 +43,7 @@ namespace Physics { namespace Implementation { }} #endif -extern template ResourceManager PHYSICS_EXPORT *& ResourceManager::internalInstance(); +extern template ResourceManager MAGNUM_PHYSICS_EXPORT *& ResourceManager::internalInstance(); namespace Physics { @@ -81,7 +81,7 @@ ObjectShape2D* shape; group.add(DebugDrawResourceManager::createDebugRenderer(shape, "red")); @endcode */ -class PHYSICS_EXPORT DebugDrawResourceManager: public ResourceManager { +class MAGNUM_PHYSICS_EXPORT DebugDrawResourceManager: public ResourceManager { public: #ifdef DOXYGEN_GENERATING_OUTPUT /** @brief %Options */ diff --git a/src/Physics/Line.h b/src/Physics/Line.h index df509d87d..26d3232dd 100644 --- a/src/Physics/Line.h +++ b/src/Physics/Line.h @@ -32,7 +32,7 @@ namespace Magnum { namespace Physics { @see Line2D, Line3D @todo collision detection of two Line2D */ -template class PHYSICS_EXPORT Line: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT Line: public AbstractShape { public: /** @brief Constructor */ inline Line(const typename DimensionTraits::VectorType& a, const typename DimensionTraits::VectorType& b): _a(a), _transformedA(a), _b(b), _transformedB(b) {} diff --git a/src/Physics/ObjectShape.h b/src/Physics/ObjectShape.h index 8a2d23d6a..61791fa21 100644 --- a/src/Physics/ObjectShape.h +++ b/src/Physics/ObjectShape.h @@ -32,7 +32,7 @@ namespace Magnum { namespace Physics { Adds shape for collision detection to object. @see ObjectShape2D, ObjectShape3D */ -template class PHYSICS_EXPORT ObjectShape: public SceneGraph::AbstractGroupedFeature> { +template class MAGNUM_PHYSICS_EXPORT ObjectShape: public SceneGraph::AbstractGroupedFeature> { public: /** * @brief Constructor diff --git a/src/Physics/ObjectShapeGroup.h b/src/Physics/ObjectShapeGroup.h index e05233434..4e2c1a188 100644 --- a/src/Physics/ObjectShapeGroup.h +++ b/src/Physics/ObjectShapeGroup.h @@ -34,7 +34,7 @@ namespace Magnum { namespace Physics { @see ObjectShapeGroup2D, ObjectShapeGroup3D */ -template class PHYSICS_EXPORT ObjectShapeGroup: public SceneGraph::FeatureGroup> { +template class MAGNUM_PHYSICS_EXPORT ObjectShapeGroup: public SceneGraph::FeatureGroup> { friend class ObjectShape; public: diff --git a/src/Physics/Plane.h b/src/Physics/Plane.h index 253e41484..d3ff91617 100644 --- a/src/Physics/Plane.h +++ b/src/Physics/Plane.h @@ -28,7 +28,7 @@ namespace Magnum { namespace Physics { /** @brief Infinite plane, defined by position and normal (3D only) */ -class PHYSICS_EXPORT Plane: public AbstractShape<3> { +class MAGNUM_PHYSICS_EXPORT Plane: public AbstractShape<3> { public: /** @brief Constructor */ inline Plane(const Vector3& position, const Vector3& normal): _position(position), _transformedPosition(position), _normal(normal), _transformedNormal(normal) {} diff --git a/src/Physics/Point.h b/src/Physics/Point.h index a228173f9..70bf6df40 100644 --- a/src/Physics/Point.h +++ b/src/Physics/Point.h @@ -31,7 +31,7 @@ namespace Magnum { namespace Physics { @see Point2D, Point3D */ -template class PHYSICS_EXPORT Point: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT Point: public AbstractShape { public: /** @brief Constructor */ inline Point(const typename DimensionTraits::VectorType& position): _position(position), _transformedPosition(position) {} diff --git a/src/Physics/ShapeGroup.h b/src/Physics/ShapeGroup.h index 04992413d..5a00f0488 100644 --- a/src/Physics/ShapeGroup.h +++ b/src/Physics/ShapeGroup.h @@ -57,7 +57,7 @@ Result of logical operations on shapes. See @ref collision-detection for brief introduction. @see ShapeGroup2D, ShapeGroup3D */ -template class PHYSICS_EXPORT ShapeGroup: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT ShapeGroup: public AbstractShape { #ifndef DOXYGEN_GENERATING_OUTPUT // template friend constexpr operator~(const T& a) -> enableIfIsBaseType; // template friend constexpr operator~(T&& a) -> enableIfIsBaseType; diff --git a/src/Physics/Sphere.h b/src/Physics/Sphere.h index f77cf8415..1f96f698a 100644 --- a/src/Physics/Sphere.h +++ b/src/Physics/Sphere.h @@ -34,7 +34,7 @@ Unlike other elements the sphere doesn't support asymmetric scaling. When applying transformation, the scale factor is averaged from all axes. @see Sphere2D, Sphere3D */ -template class PHYSICS_EXPORT Sphere: public AbstractShape { +template class MAGNUM_PHYSICS_EXPORT Sphere: public AbstractShape { public: /** @brief Constructor */ inline Sphere(const typename DimensionTraits::VectorType& position, float radius): _position(position), _transformedPosition(position), _radius(radius), _transformedRadius(radius) {} diff --git a/src/Physics/magnumPhysicsVisibility.h b/src/Physics/magnumPhysicsVisibility.h index f7af6cd73..a2e487560 100644 --- a/src/Physics/magnumPhysicsVisibility.h +++ b/src/Physics/magnumPhysicsVisibility.h @@ -17,12 +17,12 @@ #ifdef _WIN32 #ifdef MagnumPhysics_EXPORTS - #define PHYSICS_EXPORT __declspec(dllexport) + #define MAGNUM_PHYSICS_EXPORT __declspec(dllexport) #else - #define PHYSICS_EXPORT __declspec(dllimport) + #define MAGNUM_PHYSICS_EXPORT __declspec(dllimport) #endif #else - #define PHYSICS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_PHYSICS_EXPORT __attribute__ ((visibility ("default"))) #endif #endif diff --git a/src/SceneGraph/AbstractCamera.h b/src/SceneGraph/AbstractCamera.h index 0b538d672..dae625e54 100644 --- a/src/SceneGraph/AbstractCamera.h +++ b/src/SceneGraph/AbstractCamera.h @@ -69,7 +69,7 @@ template #else template #endif -class SCENEGRAPH_EXPORT AbstractCamera: public AbstractFeature { +class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera: public AbstractFeature { public: /** * @brief Constructor diff --git a/src/SceneGraph/Camera.cpp b/src/SceneGraph/Camera.cpp index dbb8e1081..1bdc04553 100644 --- a/src/SceneGraph/Camera.cpp +++ b/src/SceneGraph/Camera.cpp @@ -19,10 +19,10 @@ namespace Magnum { namespace SceneGraph { #ifndef DOXYGEN_GENERATING_OUTPUT -template class SCENEGRAPH_EXPORT AbstractCamera<2, GLfloat>; -template class SCENEGRAPH_EXPORT AbstractCamera<3, GLfloat>; -template class SCENEGRAPH_EXPORT Camera2D; -template class SCENEGRAPH_EXPORT Camera3D; +template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera<2, GLfloat>; +template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera<3, GLfloat>; +template class MAGNUM_SCENEGRAPH_EXPORT Camera2D; +template class MAGNUM_SCENEGRAPH_EXPORT Camera3D; #endif }} diff --git a/src/SceneGraph/Camera2D.h b/src/SceneGraph/Camera2D.h index c38e9d052..072fc6f92 100644 --- a/src/SceneGraph/Camera2D.h +++ b/src/SceneGraph/Camera2D.h @@ -43,7 +43,7 @@ template #else template #endif -class SCENEGRAPH_EXPORT Camera2D: public AbstractCamera<2, T> { +class MAGNUM_SCENEGRAPH_EXPORT Camera2D: public AbstractCamera<2, T> { public: /** * @brief Constructor diff --git a/src/SceneGraph/Camera3D.h b/src/SceneGraph/Camera3D.h index 4c6056fc5..fae8579ff 100644 --- a/src/SceneGraph/Camera3D.h +++ b/src/SceneGraph/Camera3D.h @@ -48,7 +48,7 @@ template #else template #endif -class SCENEGRAPH_EXPORT Camera3D: public AbstractCamera<3, T> { +class MAGNUM_SCENEGRAPH_EXPORT Camera3D: public AbstractCamera<3, T> { public: /** * @brief Constructor diff --git a/src/SceneGraph/MatrixTransformation2D.cpp b/src/SceneGraph/MatrixTransformation2D.cpp index 340371b97..7850ca48c 100644 --- a/src/SceneGraph/MatrixTransformation2D.cpp +++ b/src/SceneGraph/MatrixTransformation2D.cpp @@ -20,7 +20,7 @@ namespace Magnum { namespace SceneGraph { #ifndef DOXYGEN_GENERATING_OUTPUT -template class SCENEGRAPH_EXPORT Object>; +template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif }} diff --git a/src/SceneGraph/MatrixTransformation3D.cpp b/src/SceneGraph/MatrixTransformation3D.cpp index 8c2d78a48..bbcc227e8 100644 --- a/src/SceneGraph/MatrixTransformation3D.cpp +++ b/src/SceneGraph/MatrixTransformation3D.cpp @@ -20,7 +20,7 @@ namespace Magnum { namespace SceneGraph { #ifndef DOXYGEN_GENERATING_OUTPUT -template class SCENEGRAPH_EXPORT Object>; +template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif }} diff --git a/src/SceneGraph/magnumSceneGraphVisibility.h b/src/SceneGraph/magnumSceneGraphVisibility.h index 2e1c2e758..cd1be31fa 100644 --- a/src/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/SceneGraph/magnumSceneGraphVisibility.h @@ -17,13 +17,13 @@ #ifdef _WIN32 #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) - #define SCENEGRAPH_EXPORT __declspec(dllexport) + #define MAGNUM_SCENEGRAPH_EXPORT __declspec(dllexport) #else - #define SCENEGRAPH_EXPORT __declspec(dllimport) + #define MAGNUM_SCENEGRAPH_EXPORT __declspec(dllimport) #endif #define SCENEGRAPH_LOCAL #else - #define SCENEGRAPH_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_SCENEGRAPH_EXPORT __attribute__ ((visibility ("default"))) #define SCENEGRAPH_LOCAL __attribute__ ((visibility ("hidden"))) #endif diff --git a/src/Shaders/FlatShader.h b/src/Shaders/FlatShader.h index 68ff70231..3467666ad 100644 --- a/src/Shaders/FlatShader.h +++ b/src/Shaders/FlatShader.h @@ -35,7 +35,7 @@ namespace Magnum { namespace Shaders { Draws whole mesh with one color. @see FlatShader2D, FlatShader3D */ -template class SHADERS_EXPORT FlatShader: public AbstractShaderProgram { +template class MAGNUM_SHADERS_EXPORT FlatShader: public AbstractShaderProgram { public: /** @brief Vertex position */ typedef Attribute<0, typename DimensionTraits::PointType> Position; diff --git a/src/Shaders/PhongShader.h b/src/Shaders/PhongShader.h index 9ec97be53..14d4dd970 100644 --- a/src/Shaders/PhongShader.h +++ b/src/Shaders/PhongShader.h @@ -33,7 +33,7 @@ namespace Magnum { namespace Shaders { If supported, uses GLSL 3.20 and @extension{ARB,explicit_attrib_location}, otherwise falls back to GLSL 1.20. */ -class SHADERS_EXPORT PhongShader: public AbstractShaderProgram { +class MAGNUM_SHADERS_EXPORT PhongShader: public AbstractShaderProgram { public: typedef Attribute<0, Point3D> Position; /**< @brief Vertex position */ typedef Attribute<1, Vector3> Normal; /**< @brief Normal direction */ diff --git a/src/Shaders/VertexColorShader.h b/src/Shaders/VertexColorShader.h index fbed9f38a..35cd3377f 100644 --- a/src/Shaders/VertexColorShader.h +++ b/src/Shaders/VertexColorShader.h @@ -35,7 +35,7 @@ namespace Magnum { namespace Shaders { Draws vertex-colored mesh. @see VertexColorShader2D, VertexColorShader3D */ -template class SHADERS_EXPORT VertexColorShader: public AbstractShaderProgram { +template class MAGNUM_SHADERS_EXPORT VertexColorShader: public AbstractShaderProgram { public: /** @brief Vertex position */ typedef Attribute<0, typename DimensionTraits::PointType> Position; diff --git a/src/Shaders/magnumShadersVisibility.h b/src/Shaders/magnumShadersVisibility.h index 75d681731..047ee9eca 100644 --- a/src/Shaders/magnumShadersVisibility.h +++ b/src/Shaders/magnumShadersVisibility.h @@ -17,12 +17,12 @@ #ifdef _WIN32 #ifdef MagnumShaders_EXPORTS - #define SHADERS_EXPORT __declspec(dllexport) + #define MAGNUM_SHADERS_EXPORT __declspec(dllexport) #else - #define SHADERS_EXPORT __declspec(dllimport) + #define MAGNUM_SHADERS_EXPORT __declspec(dllimport) #endif #else - #define SHADERS_EXPORT __attribute__ ((visibility ("default"))) + #define MAGNUM_SHADERS_EXPORT __attribute__ ((visibility ("default"))) #endif #endif