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

SceneGraph: fix linking to the library on MSYS2/Clang.

pull/417/head
William JCM 6 years ago
parent
16f845e4fb
commit
4b929769df
17 changed files with 17 additions and 17 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/SceneGraph/AbstractFeature.h
  2. 2
      src/Magnum/SceneGraph/AbstractObject.h
  3. 2
      src/Magnum/SceneGraph/AbstractTransformation.h
  4. 2
      src/Magnum/SceneGraph/Animable.h
  5. 2
      src/Magnum/SceneGraph/AnimableGroup.h
  6. 2
      src/Magnum/SceneGraph/Camera.h
  7. 2
      src/Magnum/SceneGraph/Drawable.h
  8. 2
      src/Magnum/SceneGraph/DualComplexTransformation.h
  9. 2
      src/Magnum/SceneGraph/DualQuaternionTransformation.h
  10. 2
      src/Magnum/SceneGraph/FeatureGroup.h
  11. 2
      src/Magnum/SceneGraph/MatrixTransformation2D.h
  12. 2
      src/Magnum/SceneGraph/MatrixTransformation3D.h
  13. 2
      src/Magnum/SceneGraph/RigidMatrixTransformation2D.h
  14. 2
      src/Magnum/SceneGraph/RigidMatrixTransformation3D.h
  15. 2
      src/Magnum/SceneGraph/TranslationRotationScalingTransformation2D.h
  16. 2
      src/Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h
  17. 2
      src/Magnum/SceneGraph/TranslationTransformation.h

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

@ -312,7 +312,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

@ -305,7 +305,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

@ -224,7 +224,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

@ -254,7 +254,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

@ -233,7 +233,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 Object<BasicMatrixTransformation2D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation2D<Float>>;
#endif #endif

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

@ -317,7 +317,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 Object<BasicMatrixTransformation3D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicMatrixTransformation3D<Float>>;
#endif #endif

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

@ -253,7 +253,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 Object<BasicRigidMatrixTransformation2D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation2D<Float>>;
#endif #endif

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

@ -337,7 +337,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 Object<BasicRigidMatrixTransformation3D<Float>>; extern template class MAGNUM_SCENEGRAPH_EXPORT Object<BasicRigidMatrixTransformation3D<Float>>;
#endif #endif

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

@ -314,7 +314,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

@ -404,7 +404,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