ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix one particular kind of linker errors on MingGW Clang. 

The existing ifdefs apparently were just to work around something in
MinGW GCC. MSVC, Clang-cl and MinGW Clang don't need these.
pull/442/head
William JCM 6 years ago committed by Vladimír Vondruš
parent
62fa2007e6
commit
8a42c727c1
22 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/Magnum/Animation/Player.h
  2. 2
      src/Magnum/Audio/Listener.h
  3. 2
      src/Magnum/Audio/Playable.h
  4. 2
      src/Magnum/Audio/PlayableGroup.h
  5. 2
      src/Magnum/MeshTools/CompressIndices.h
  6. 2
      src/Magnum/SceneGraph/AbstractFeature.h
  7. 2
      src/Magnum/SceneGraph/AbstractObject.h
  8. 2
      src/Magnum/SceneGraph/AbstractTransformation.h
  9. 2
      src/Magnum/SceneGraph/Animable.h
  10. 2
      src/Magnum/SceneGraph/AnimableGroup.h
  11. 2
      src/Magnum/SceneGraph/Camera.h
  12. 2
      src/Magnum/SceneGraph/Drawable.h
  13. 2
      src/Magnum/SceneGraph/DualComplexTransformation.h
  14. 2
      src/Magnum/SceneGraph/DualQuaternionTransformation.h
  15. 2
      src/Magnum/SceneGraph/FeatureGroup.h
  16. 2
      src/Magnum/SceneGraph/MatrixTransformation2D.h
  17. 2
      src/Magnum/SceneGraph/MatrixTransformation3D.h
  18. 2
      src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
  19. 2
      src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
  20. 2
      src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h
  21. 2
      src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h
  22. 2
      src/Magnum/SceneGraph/TranslationTransformation.h

2
src/Magnum/Animation/Player.h
Unescape View File

@ -872,7 +872,7 @@ template<class T, class K> template<class V, class R, class Callback> Player<T,
} }
#endif #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_EXPORT Player<Float, Float>; extern template class MAGNUM_EXPORT Player<Float, Float>;
extern template class MAGNUM_EXPORT Player<std::chrono::nanoseconds, Float>; extern template class MAGNUM_EXPORT Player<std::chrono::nanoseconds, Float>;
#endif #endif

2
src/Magnum/Audio/Listener.h
Unescape View File

@ -157,7 +157,7 @@ typedef Listener<2> Listener2D;
*/ */
typedef Listener<3> Listener3D; typedef Listener<3> Listener3D;
#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) #if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG))
extern template class MAGNUM_AUDIO_EXPORT Listener<2>; extern template class MAGNUM_AUDIO_EXPORT Listener<2>;
extern template class MAGNUM_AUDIO_EXPORT Listener<3>; extern template class MAGNUM_AUDIO_EXPORT Listener<3>;
#endif #endif

2
src/Magnum/Audio/Playable.h
Unescape View File

@ -155,7 +155,7 @@ typedef Playable<2> Playable2D;
*/ */
typedef Playable<3> Playable3D; typedef Playable<3> Playable3D;
#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) #if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG))
extern template class MAGNUM_AUDIO_EXPORT Playable<2>; extern template class MAGNUM_AUDIO_EXPORT Playable<2>;
extern template class MAGNUM_AUDIO_EXPORT Playable<3>; extern template class MAGNUM_AUDIO_EXPORT Playable<3>;
#endif #endif

2
src/Magnum/Audio/PlayableGroup.h
Unescape View File

@ -128,7 +128,7 @@ typedef PlayableGroup<2> PlayableGroup2D;
*/ */
typedef PlayableGroup<3> PlayableGroup3D; typedef PlayableGroup<3> PlayableGroup3D;
#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) #if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG))
extern template class MAGNUM_AUDIO_EXPORT PlayableGroup<2>; extern template class MAGNUM_AUDIO_EXPORT PlayableGroup<2>;
extern template class MAGNUM_AUDIO_EXPORT PlayableGroup<3>; extern template class MAGNUM_AUDIO_EXPORT PlayableGroup<3>;
#endif #endif

2
src/Magnum/MeshTools/CompressIndices.h
Unescape View File

@ -196,7 +196,7 @@ Example usage:
*/ */
template<class T> CORRADE_DEPRECATED("use compressIndices(const Containers::StridedArrayView1D<const UnsignedInt>&, MeshIndexType, Long) instead") MAGNUM_MESHTOOLS_EXPORT Containers::Array<T> compressIndicesAs(const std::vector<UnsignedInt>& indices); template<class T> CORRADE_DEPRECATED("use compressIndices(const Containers::StridedArrayView1D<const UnsignedInt>&, MeshIndexType, Long) instead") MAGNUM_MESHTOOLS_EXPORT Containers::Array<T> compressIndicesAs(const std::vector<UnsignedInt>& indices);
#if defined(CORRADE_TARGET_WINDOWS) && !defined(__MINGW32__) #if defined(CORRADE_TARGET_WINDOWS) && !(defined(CORRADE_TARGET_MINGW) && !defined(CORRADE_TARGET_CLANG))
extern template MAGNUM_MESHTOOLS_EXPORT Containers::Array<UnsignedByte> compressIndicesAs<UnsignedByte>(const std::vector<UnsignedInt>&); extern template MAGNUM_MESHTOOLS_EXPORT Containers::Array<UnsignedByte> compressIndicesAs<UnsignedByte>(const std::vector<UnsignedInt>&);
extern template MAGNUM_MESHTOOLS_EXPORT Containers::Array<UnsignedShort> compressIndicesAs<UnsignedShort>(const std::vector<UnsignedInt>&); extern template MAGNUM_MESHTOOLS_EXPORT Containers::Array<UnsignedShort> compressIndicesAs<UnsignedShort>(const std::vector<UnsignedInt>&);
extern template MAGNUM_MESHTOOLS_EXPORT Containers::Array<UnsignedInt> compressIndicesAs<UnsignedInt>(const std::vector<UnsignedInt>&); extern template MAGNUM_MESHTOOLS_EXPORT Containers::Array<UnsignedInt> compressIndicesAs<UnsignedInt>(const std::vector<UnsignedInt>&);

2
src/Magnum/SceneGraph/AbstractFeature.h
Unescape View File

@ -316,7 +316,7 @@ template<class T> using AbstractBasicFeature3D = AbstractFeature<3, T>;
*/ */
typedef AbstractBasicFeature3D<Float> AbstractFeature3D; typedef AbstractBasicFeature3D<Float> 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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeature<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/AbstractObject.h
Unescape View File

@ -313,7 +313,7 @@ typedef AbstractBasicObject3D<Float> AbstractObject3D;
typedef AbstractObject<3, Float> AbstractObject3D; typedef AbstractObject<3, Float> AbstractObject3D;
#endif #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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractObject<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractObject<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/AbstractTransformation.h
Unescape View File

@ -122,7 +122,7 @@ template<class T> using AbstractBasicTransformation3D = AbstractTransformation<3
*/ */
typedef AbstractBasicTransformation3D<Float> AbstractTransformation3D; typedef AbstractBasicTransformation3D<Float> 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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractTransformation<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractTransformation<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/Animable.h
Unescape View File

@ -339,7 +339,7 @@ template<class T> using BasicAnimable3D = Animable<3, T>;
*/ */
typedef BasicAnimable3D<Float> Animable3D; typedef BasicAnimable3D<Float> 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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Animable<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT Animable<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/AnimableGroup.h
Unescape View File

@ -109,7 +109,7 @@ template<class T> using BasicAnimableGroup3D = AnimableGroup<3, T>;
*/ */
typedef BasicAnimableGroup3D<Float> AnimableGroup3D; typedef BasicAnimableGroup3D<Float> 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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AnimableGroup<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/Camera.h
Unescape View File

@ -266,7 +266,7 @@ template<class T> using BasicCamera3D = Camera<3, T>;
*/ */
typedef BasicCamera3D<Float> Camera3D; typedef BasicCamera3D<Float> 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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Camera<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT Camera<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/Drawable.h
Unescape View File

@ -272,7 +272,7 @@ template<class T> using BasicDrawableGroup3D = DrawableGroup<3, T>;
*/ */
typedef BasicDrawableGroup3D<Float> DrawableGroup3D; typedef BasicDrawableGroup3D<Float> 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<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/DualComplexTransformation.h
Unescape View File

@ -258,7 +258,7 @@ template<class T> struct Transformation<BasicDualComplexTransformation<T>> {
} }
#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<BasicDualComplexTransformation<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicDualComplexTransformation<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/DualQuaternionTransformation.h
Unescape View File

@ -288,7 +288,7 @@ template<class T> struct Transformation<BasicDualQuaternionTransformation<T>> {
} }
#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<BasicDualQuaternionTransformation<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicDualQuaternionTransformation<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/FeatureGroup.h
Unescape View File

@ -197,7 +197,7 @@ template<UnsignedInt dimensions, class Feature, class T> FeatureGroup<dimensions
return *this; return *this;
} }
#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 AbstractFeatureGroup<2, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<2, Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<3, Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT AbstractFeatureGroup<3, Float>;
#endif #endif

2
src/Magnum/SceneGraph/MatrixTransformation2D.h
Unescape View File

@ -261,7 +261,7 @@ template<class T> struct Transformation<BasicMatrixTransformation2D<T>> {
} }
#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 BasicMatrixTransformation2D<Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT BasicMatrixTransformation2D<Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation2D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation2D<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/MatrixTransformation3D.h
Unescape View File

@ -347,7 +347,7 @@ template<class T> struct Transformation<BasicMatrixTransformation3D<T>> {
} }
#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 BasicMatrixTransformation3D<Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT BasicMatrixTransformation3D<Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation3D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation3D<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
Unescape View File

@ -281,7 +281,7 @@ template<class T> struct Transformation<BasicRigidMatrixTransformation2D<T>> {
} }
#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 BasicRigidMatrixTransformation2D<Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT BasicRigidMatrixTransformation2D<Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation2D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation2D<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
Unescape View File

@ -366,7 +366,7 @@ template<class T> struct Transformation<BasicRigidMatrixTransformation3D<T>> {
} }
#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 BasicRigidMatrixTransformation3D<Float>; extern template class MAGNUM_SCENEGRAPH_EXPORT BasicRigidMatrixTransformation3D<Float>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation3D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation3D<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h
Unescape View File

@ -321,7 +321,7 @@ template<class T> struct Transformation<BasicTranslationRotationScalingTransform
} }
#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<BasicTranslationRotationScalingTransformation2D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicTranslationRotationScalingTransformation2D<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h
Unescape View File

@ -410,7 +410,7 @@ template<class T> struct Transformation<BasicTranslationRotationScalingTransform
} }
#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<BasicTranslationRotationScalingTransformation3D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicTranslationRotationScalingTransformation3D<Float>>;
#endif #endif

2
src/Magnum/SceneGraph/TranslationTransformation.h
Unescape View File

@ -195,7 +195,7 @@ template<UnsignedInt dimensions, class T, class TranslationType> 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<TranslationTransformation<2, Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<2, Float>>;
extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<3, Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<TranslationTransformation<3, Float>>;
#endif #endif

Write Preview
Loading…
Cancel
Save