From 4b929769dfcf6b90512c8a4349577e409c12600d Mon Sep 17 00:00:00 2001 From: William JCM Date: Tue, 14 Jan 2020 22:03:46 +0100 Subject: [PATCH] SceneGraph: fix linking to the library on MSYS2/Clang. --- src/Magnum/SceneGraph/AbstractFeature.h | 2 +- src/Magnum/SceneGraph/AbstractObject.h | 2 +- src/Magnum/SceneGraph/AbstractTransformation.h | 2 +- src/Magnum/SceneGraph/Animable.h | 2 +- src/Magnum/SceneGraph/AnimableGroup.h | 2 +- src/Magnum/SceneGraph/Camera.h | 2 +- src/Magnum/SceneGraph/Drawable.h | 2 +- src/Magnum/SceneGraph/DualComplexTransformation.h | 2 +- src/Magnum/SceneGraph/DualQuaternionTransformation.h | 2 +- src/Magnum/SceneGraph/FeatureGroup.h | 2 +- src/Magnum/SceneGraph/MatrixTransformation2D.h | 2 +- src/Magnum/SceneGraph/MatrixTransformation3D.h | 2 +- src/Magnum/SceneGraph/RigidMatrixTransformation2D.h | 2 +- src/Magnum/SceneGraph/RigidMatrixTransformation3D.h | 2 +- .../SceneGraph/TranslationRotationScalingTransformation2D.h | 2 +- .../SceneGraph/TranslationRotationScalingTransformation3D.h | 2 +- src/Magnum/SceneGraph/TranslationTransformation.h | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Magnum/SceneGraph/AbstractFeature.h b/src/Magnum/SceneGraph/AbstractFeature.h index 48cdcf957..b9001f507 100644 --- a/src/Magnum/SceneGraph/AbstractFeature.h +++ b/src/Magnum/SceneGraph/AbstractFeature.h @@ -312,7 +312,7 @@ template using AbstractBasicFeature3D = AbstractFeature<3, T>; */ typedef AbstractBasicFeature3D AbstractFeature3D; -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index 7be9088e6..c1ffe4e32 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -305,7 +305,7 @@ typedef AbstractBasicObject3D AbstractObject3D; typedef AbstractObject<3, Float> AbstractObject3D; #endif -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractObject<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractObject<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h index bf8d72121..ecc2c780d 100644 --- a/src/Magnum/SceneGraph/AbstractTransformation.h +++ b/src/Magnum/SceneGraph/AbstractTransformation.h @@ -122,7 +122,7 @@ template using AbstractBasicTransformation3D = AbstractTransformation<3 */ typedef AbstractBasicTransformation3D AbstractTransformation3D; -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractTransformation<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractTransformation<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h index d8e918e71..7b60c9ae5 100644 --- a/src/Magnum/SceneGraph/Animable.h +++ b/src/Magnum/SceneGraph/Animable.h @@ -339,7 +339,7 @@ template using BasicAnimable3D = Animable<3, T>; */ typedef BasicAnimable3D Animable3D; -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Animable<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT Animable<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h index 0582643c2..afc105f7a 100644 --- a/src/Magnum/SceneGraph/AnimableGroup.h +++ b/src/Magnum/SceneGraph/AnimableGroup.h @@ -109,7 +109,7 @@ template using BasicAnimableGroup3D = AnimableGroup<3, T>; */ typedef BasicAnimableGroup3D AnimableGroup3D; -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/Camera.h b/src/Magnum/SceneGraph/Camera.h index 820ffc4f4..ef57e1018 100644 --- a/src/Magnum/SceneGraph/Camera.h +++ b/src/Magnum/SceneGraph/Camera.h @@ -266,7 +266,7 @@ template using BasicCamera3D = Camera<3, T>; */ typedef BasicCamera3D Camera3D; -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Camera<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT Camera<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h index 9a86f5232..0c4ae0c6f 100644 --- a/src/Magnum/SceneGraph/Drawable.h +++ b/src/Magnum/SceneGraph/Drawable.h @@ -272,7 +272,7 @@ template using BasicDrawableGroup3D = DrawableGroup<3, T>; */ typedef BasicDrawableGroup3D DrawableGroup3D; -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/DualComplexTransformation.h b/src/Magnum/SceneGraph/DualComplexTransformation.h index 2623ce323..1cc23536d 100644 --- a/src/Magnum/SceneGraph/DualComplexTransformation.h +++ b/src/Magnum/SceneGraph/DualComplexTransformation.h @@ -224,7 +224,7 @@ template struct Transformation> { } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/Magnum/SceneGraph/DualQuaternionTransformation.h b/src/Magnum/SceneGraph/DualQuaternionTransformation.h index 88d86955d..f7609ac2c 100644 --- a/src/Magnum/SceneGraph/DualQuaternionTransformation.h +++ b/src/Magnum/SceneGraph/DualQuaternionTransformation.h @@ -254,7 +254,7 @@ template struct Transformation> { } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index b519e4985..50dd057b2 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -197,7 +197,7 @@ template FeatureGroup; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<3, Float>; #endif diff --git a/src/Magnum/SceneGraph/MatrixTransformation2D.h b/src/Magnum/SceneGraph/MatrixTransformation2D.h index dfd6276ba..292fb791e 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation2D.h @@ -233,7 +233,7 @@ template struct Transformation> { } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/Magnum/SceneGraph/MatrixTransformation3D.h b/src/Magnum/SceneGraph/MatrixTransformation3D.h index f2ba5b4a3..ee77fcb3c 100644 --- a/src/Magnum/SceneGraph/MatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/MatrixTransformation3D.h @@ -317,7 +317,7 @@ template struct Transformation> { } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h index 487b013c4..921229270 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation2D.h @@ -253,7 +253,7 @@ template struct Transformation> { } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h index f9f28ac47..fca9021a5 100644 --- a/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h +++ b/src/Magnum/SceneGraph/RigidMatrixTransformation3D.h @@ -337,7 +337,7 @@ template struct Transformation> { } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif diff --git a/src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h b/src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h index 2d5a06624..df6a7387b 100644 --- a/src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h +++ b/src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h @@ -314,7 +314,7 @@ template struct Transformation>; #endif diff --git a/src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h b/src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h index 26929a655..9a362fe15 100644 --- a/src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h +++ b/src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h @@ -404,7 +404,7 @@ template struct Transformation>; #endif diff --git a/src/Magnum/SceneGraph/TranslationTransformation.h b/src/Magnum/SceneGraph/TranslationTransformation.h index 5fef255b3..6339fef39 100644 --- a/src/Magnum/SceneGraph/TranslationTransformation.h +++ b/src/Magnum/SceneGraph/TranslationTransformation.h @@ -195,7 +195,7 @@ template struct Transfor } -#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) +#if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG)) extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object>; #endif