From c9d621bed2ddf6af1a9913f564daac9f3e898efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 29 Aug 2018 23:20:18 +0200 Subject: [PATCH] Shapes: properly export all instances. Not sure why this wasn't done already. --- src/Magnum/Shapes/Box.cpp | 6 ++++-- src/Magnum/Shapes/Line.cpp | 6 ++++-- src/Magnum/Shapes/Point.cpp | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Shapes/Box.cpp b/src/Magnum/Shapes/Box.cpp index 792c408a4..f26df921b 100644 --- a/src/Magnum/Shapes/Box.cpp +++ b/src/Magnum/Shapes/Box.cpp @@ -31,7 +31,9 @@ template Box Box::transformed(co return Box(matrix*_transformation); } -template class Box<2>; -template class Box<3>; +#ifndef DOXYGEN_GENERATING_OUTPUT +template class MAGNUM_SHAPES_EXPORT Box<2>; +template class MAGNUM_SHAPES_EXPORT Box<3>; +#endif }} diff --git a/src/Magnum/Shapes/Line.cpp b/src/Magnum/Shapes/Line.cpp index e1e0d340e..7c1b3db97 100644 --- a/src/Magnum/Shapes/Line.cpp +++ b/src/Magnum/Shapes/Line.cpp @@ -36,7 +36,9 @@ template Line Line::transformed( } /* Explicitly instantiate the templates */ -template class Line<2>; -template class Line<3>; +#ifndef DOXYGEN_GENERATING_OUTPUT +template class MAGNUM_SHAPES_EXPORT Line<2>; +template class MAGNUM_SHAPES_EXPORT Line<3>; +#endif }} diff --git a/src/Magnum/Shapes/Point.cpp b/src/Magnum/Shapes/Point.cpp index a64b736bb..ca085427e 100644 --- a/src/Magnum/Shapes/Point.cpp +++ b/src/Magnum/Shapes/Point.cpp @@ -34,7 +34,9 @@ template Point Point::transforme return Point(matrix.transformPoint(_position)); } -template class Point<2>; -template class Point<3>; +#ifndef DOXYGEN_GENERATING_OUTPUT +template class MAGNUM_SHAPES_EXPORT Point<2>; +template class MAGNUM_SHAPES_EXPORT Point<3>; +#endif }}