diff --git a/src/DebugTools/ResourceManager.cpp b/src/DebugTools/ResourceManager.cpp index 8a8491f55..b13186081 100644 --- 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; #else template class MAGNUM_DEBUGTOOLS_EXPORT ResourceManager; diff --git a/src/DebugTools/ResourceManager.h b/src/DebugTools/ResourceManager.h index c83ecd7a2..eecd8c592 100644 --- 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 MAGNUM_DEBUGTOOLS_EXPORT *& ResourceManager::internalInstance(); #else extern template class MAGNUM_DEBUGTOOLS_EXPORT ResourceManager; diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index 12464fc9d..c71dfe634 100644 --- 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 diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index 50e9339bf..2f460a1f5 100644 --- 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 diff --git a/src/SceneGraph/AbstractCamera.h b/src/SceneGraph/AbstractCamera.h index 981ca9ea1..eb2a66ae4 100644 --- a/src/SceneGraph/AbstractCamera.h +++ b/src/SceneGraph/AbstractCamera.h @@ -209,7 +209,7 @@ typedef AbstractBasicCamera3D 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 diff --git a/src/SceneGraph/AbstractFeature.h b/src/SceneGraph/AbstractFeature.h index 4959fd631..5580afa9c 100644 --- a/src/SceneGraph/AbstractFeature.h +++ b/src/SceneGraph/AbstractFeature.h @@ -341,7 +341,7 @@ typedef AbstractBasicFeature3D 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 diff --git a/src/SceneGraph/AbstractObject.h b/src/SceneGraph/AbstractObject.h index 42228f852..ffe781a70 100644 --- a/src/SceneGraph/AbstractObject.h +++ b/src/SceneGraph/AbstractObject.h @@ -277,7 +277,7 @@ typedef AbstractBasicObject3D 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 diff --git a/src/SceneGraph/AbstractTransformation.h b/src/SceneGraph/AbstractTransformation.h index 33e74ab09..0ba971d82 100644 --- a/src/SceneGraph/AbstractTransformation.h +++ b/src/SceneGraph/AbstractTransformation.h @@ -144,7 +144,7 @@ typedef AbstractBasicTransformation3D 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 diff --git a/src/SceneGraph/Animable.h b/src/SceneGraph/Animable.h index 6da6a2d5a..453d6def2 100644 --- a/src/SceneGraph/Animable.h +++ b/src/SceneGraph/Animable.h @@ -380,7 +380,7 @@ typedef BasicAnimable3D 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 diff --git a/src/SceneGraph/AnimableGroup.h b/src/SceneGraph/AnimableGroup.h index da42aaa6f..d88623fb9 100644 --- a/src/SceneGraph/AnimableGroup.h +++ b/src/SceneGraph/AnimableGroup.h @@ -118,7 +118,7 @@ typedef BasicAnimableGroup3D 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 diff --git a/src/SceneGraph/Camera2D.h b/src/SceneGraph/Camera2D.h index 09183c9ef..610af6419 100644 --- a/src/SceneGraph/Camera2D.h +++ b/src/SceneGraph/Camera2D.h @@ -105,7 +105,7 @@ template class BasicCamera2D: public AbstractCamera<2, T> { */ typedef BasicCamera2D Camera2D; -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT BasicCamera2D; #endif diff --git a/src/SceneGraph/Camera3D.h b/src/SceneGraph/Camera3D.h index 8b126458b..d6744d953 100644 --- 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 BasicCamera3D: public AbstractCamera<3, T> { */ typedef BasicCamera3D Camera3D; -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT BasicCamera3D; #endif diff --git a/src/SceneGraph/DualComplexTransformation.h b/src/SceneGraph/DualComplexTransformation.h index 6037fab9e..e5302af2f 100644 --- a/src/SceneGraph/DualComplexTransformation.h +++ b/src/SceneGraph/DualComplexTransformation.h @@ -183,7 +183,7 @@ template struct Transformation> { } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/DualQuaternionTransformation.h b/src/SceneGraph/DualQuaternionTransformation.h index f94e29d82..6a39c8d5b 100644 --- a/src/SceneGraph/DualQuaternionTransformation.h +++ b/src/SceneGraph/DualQuaternionTransformation.h @@ -200,7 +200,7 @@ template struct Transformation> { } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/FeatureGroup.h b/src/SceneGraph/FeatureGroup.h index 039896356..5934020fc 100644 --- a/src/SceneGraph/FeatureGroup.h +++ b/src/SceneGraph/FeatureGroup.h @@ -182,7 +182,7 @@ template FeatureGroup; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<3, Float>; #endif diff --git a/src/SceneGraph/MatrixTransformation2D.h b/src/SceneGraph/MatrixTransformation2D.h index d3b4f03dc..db6e238a8 100644 --- a/src/SceneGraph/MatrixTransformation2D.h +++ b/src/SceneGraph/MatrixTransformation2D.h @@ -168,7 +168,7 @@ template struct Transformation> { } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/MatrixTransformation3D.h b/src/SceneGraph/MatrixTransformation3D.h index b6adc33d2..f1d0d01e6 100644 --- a/src/SceneGraph/MatrixTransformation3D.h +++ b/src/SceneGraph/MatrixTransformation3D.h @@ -216,7 +216,7 @@ template struct Transformation> { } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/RigidMatrixTransformation2D.h b/src/SceneGraph/RigidMatrixTransformation2D.h index 072015013..e89ada21a 100644 --- a/src/SceneGraph/RigidMatrixTransformation2D.h +++ b/src/SceneGraph/RigidMatrixTransformation2D.h @@ -202,7 +202,7 @@ template struct Transformation> { } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/RigidMatrixTransformation3D.h b/src/SceneGraph/RigidMatrixTransformation3D.h index 0ada0a0af..fa25cdcc5 100644 --- a/src/SceneGraph/RigidMatrixTransformation3D.h +++ b/src/SceneGraph/RigidMatrixTransformation3D.h @@ -255,7 +255,7 @@ template struct Transformation> { } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/TranslationTransformation.h b/src/SceneGraph/TranslationTransformation.h index 3d63d484c..917ecc4dd 100644 --- a/src/SceneGraph/TranslationTransformation.h +++ b/src/SceneGraph/TranslationTransformation.h @@ -206,7 +206,7 @@ template struct Transfor } -#ifdef _WIN32 +#ifdef CORRADE_TARGET_WINDOWS extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/SceneGraph/instantiation.cpp b/src/SceneGraph/instantiation.cpp index b04fd0964..079199ddc 100644 --- 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