Use CORRADE_TARGET_WINDOWS instead of _WIN32.

13 years ago · c9104906e7
21 changed files with 22 additions and 22 deletions
--- a/src/DebugTools/ResourceManager.cpp
+++ b/src/DebugTools/ResourceManager.cpp
@ -35,7 +35,7 @@

 namespace Magnum {

-#ifndef _WIN32
+#ifndef CORRADE_TARGET_WINDOWS
 template class ResourceManager<AbstractShaderProgram, Buffer, Mesh, MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions, DebugTools::ShapeRendererOptions>;
 #else
 template class MAGNUM_DEBUGTOOLS_EXPORT ResourceManager<AbstractShaderProgram, Buffer, Mesh, MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions, DebugTools::ShapeRendererOptions>;
--- a/src/DebugTools/ResourceManager.h
+++ b/src/DebugTools/ResourceManager.h
@ -45,7 +45,7 @@ namespace Magnum {

 /** @todo Do the listing in one place, not five thousand! */

-#ifndef _WIN32
+#ifndef CORRADE_TARGET_WINDOWS
 extern template ResourceManager<AbstractShaderProgram, Buffer, Mesh, MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions, DebugTools::ShapeRendererOptions> MAGNUM_DEBUGTOOLS_EXPORT *& ResourceManager<AbstractShaderProgram, Buffer, Mesh, MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions, DebugTools::ShapeRendererOptions>::internalInstance();
 #else
 extern template class MAGNUM_DEBUGTOOLS_EXPORT ResourceManager<AbstractShaderProgram, Buffer, Mesh, MeshView, DebugTools::ForceRendererOptions, DebugTools::ObjectRendererOptions, DebugTools::ShapeRendererOptions>;
--- a/src/Math/Matrix4.h
+++ b/src/Math/Matrix4.h
@ -31,7 +31,7 @@
 #include "Math/Matrix.h"
 #include "Math/Vector4.h"

-#ifdef _WIN32 /* I so HATE windef.h */
+#ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */
 #undef near
 #undef far
 #endif
--- a/src/Platform/Sdl2Application.h
+++ b/src/Platform/Sdl2Application.h
@ -34,7 +34,7 @@
 #include "Math/Vector2.h"
 #include "Magnum.h"

-#ifdef _WIN32 /* Windows version of SDL2 redefines main(), we don't want that */
+#ifdef CORRADE_TARGET_WINDOWS /* Windows version of SDL2 redefines main(), we don't want that */
 #define SDL_MAIN_HANDLED
 #endif
 #include <SDL.h>
--- a/src/SceneGraph/AbstractCamera.h
+++ b/src/SceneGraph/AbstractCamera.h
@ -209,7 +209,7 @@ typedef AbstractBasicCamera3D<Float> AbstractCamera3D;
 typedef AbstractCamera<3, Float> AbstractCamera3D;
 #endif

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractCamera<3, Float>;
 #endif
--- a/src/SceneGraph/AbstractFeature.h
+++ b/src/SceneGraph/AbstractFeature.h
@ -341,7 +341,7 @@ typedef AbstractBasicFeature3D<Float> AbstractFeature3D;
 typedef AbstractFeature<3, Float> AbstractFeature3D;
 #endif

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<3, Float>;
 #endif
--- a/src/SceneGraph/AbstractObject.h
+++ b/src/SceneGraph/AbstractObject.h
@ -277,7 +277,7 @@ typedef AbstractBasicObject3D<Float> AbstractObject3D;
 typedef AbstractObject<3, Float> AbstractObject3D;
 #endif

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractObject<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractObject<3, Float>;
 #endif
--- a/src/SceneGraph/AbstractTransformation.h
+++ b/src/SceneGraph/AbstractTransformation.h
@ -144,7 +144,7 @@ typedef AbstractBasicTransformation3D<Float> AbstractTransformation3D;
 typedef AbstractTransformation<3, Float> AbstractTransformation3D;
 #endif

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractTransformation<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractTransformation<3, Float>;
 #endif
--- a/src/SceneGraph/Animable.h
+++ b/src/SceneGraph/Animable.h
@ -380,7 +380,7 @@ typedef BasicAnimable3D<Float> Animable3D;
 typedef Animable<3, Float> Animable3D;
 #endif

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Animable<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT Animable<3, Float>;
 #endif
--- a/src/SceneGraph/AnimableGroup.h
+++ b/src/SceneGraph/AnimableGroup.h
@ -118,7 +118,7 @@ typedef BasicAnimableGroup3D<Float> AnimableGroup3D;
 typedef AnimableGroup<3, Float> AnimableGroup3D;
 #endif

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<3, Float>;
 #endif
--- a/src/SceneGraph/Camera2D.h
+++ b/src/SceneGraph/Camera2D.h
@ -105,7 +105,7 @@ template<class T> class BasicCamera2D: public AbstractCamera<2, T> {
 */
 typedef BasicCamera2D<Float> Camera2D;

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT BasicCamera2D<Float>;
 #endif

--- a/src/SceneGraph/Camera3D.h
+++ b/src/SceneGraph/Camera3D.h
@ -30,7 +30,7 @@

 #include "AbstractCamera.h"

-#ifdef _WIN32 /* I so HATE windef.h */
+#ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */
 #undef near
 #undef far
 #endif
@ -141,7 +141,7 @@ template<class T> class BasicCamera3D: public AbstractCamera<3, T> {
 */
 typedef BasicCamera3D<Float> Camera3D;

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT BasicCamera3D<Float>;
 #endif

--- a/src/SceneGraph/DualComplexTransformation.h
+++ b/src/SceneGraph/DualComplexTransformation.h
@ -183,7 +183,7 @@ template<class T> struct Transformation<BasicDualComplexTransformation<T>> {

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicDualComplexTransformation<Float>>;
 #endif

--- a/src/SceneGraph/DualQuaternionTransformation.h
+++ b/src/SceneGraph/DualQuaternionTransformation.h
@ -200,7 +200,7 @@ template<class T> struct Transformation<BasicDualQuaternionTransformation<T>> {

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicDualQuaternionTransformation<Float>>;
 #endif

--- a/src/SceneGraph/FeatureGroup.h
+++ b/src/SceneGraph/FeatureGroup.h
@ -182,7 +182,7 @@ template<UnsignedInt dimensions, class Feature, class T> FeatureGroup<dimensions
    return *this;
 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<2, Float>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<3, Float>;
 #endif
--- a/src/SceneGraph/MatrixTransformation2D.h
+++ b/src/SceneGraph/MatrixTransformation2D.h
@ -168,7 +168,7 @@ template<class T> struct Transformation<BasicMatrixTransformation2D<T>> {

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation2D<Float>>;
 #endif

--- a/src/SceneGraph/MatrixTransformation3D.h
+++ b/src/SceneGraph/MatrixTransformation3D.h
@ -216,7 +216,7 @@ template<class T> struct Transformation<BasicMatrixTransformation3D<T>> {

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation3D<Float>>;
 #endif

--- a/src/SceneGraph/RigidMatrixTransformation2D.h
+++ b/src/SceneGraph/RigidMatrixTransformation2D.h
@ -202,7 +202,7 @@ template<class T> struct Transformation<BasicRigidMatrixTransformation2D<T>> {

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation2D<Float>>;
 #endif

--- a/src/SceneGraph/RigidMatrixTransformation3D.h
+++ b/src/SceneGraph/RigidMatrixTransformation3D.h
@ -255,7 +255,7 @@ template<class T> struct Transformation<BasicRigidMatrixTransformation3D<T>> {

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation3D<Float>>;
 #endif

--- a/src/SceneGraph/TranslationTransformation.h
+++ b/src/SceneGraph/TranslationTransformation.h
@ -206,7 +206,7 @@ template<UnsignedInt dimensions, class T, class TranslationType> struct Transfor

 }

-#ifdef _WIN32
+#ifdef CORRADE_TARGET_WINDOWS
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<2, Float>>;
 extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<3, Float>>;
 #endif
--- a/src/SceneGraph/instantiation.cpp
+++ b/src/SceneGraph/instantiation.cpp
@ -39,7 +39,7 @@
 namespace Magnum { namespace SceneGraph {

 /* On Windows the instantiations are already marked with extern template */
-#ifndef _WIN32
+#ifndef CORRADE_TARGET_WINDOWS
 #define MAGNUM_SCENEGRAPH_EXPORT_HPP MAGNUM_SCENEGRAPH_EXPORT
 #else
 #define MAGNUM_SCENEGRAPH_EXPORT_HPP