From 412011f2f87d3c2f7c3aa2fa4bd26e07bebb8a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 11 Jan 2014 16:04:54 +0100 Subject: [PATCH] Fixed linker errors on Windows. --- src/Magnum/AbstractImage.cpp | 6 +++--- src/Magnum/SceneGraph/Drawable.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Magnum/AbstractImage.cpp b/src/Magnum/AbstractImage.cpp index 626cb9710..1a97a4eff 100644 --- a/src/Magnum/AbstractImage.cpp +++ b/src/Magnum/AbstractImage.cpp @@ -146,8 +146,8 @@ template std::size_t AbstractImage::dataSize(Math::Vecto return rowSize*size.product(); } -template std::size_t AbstractImage::dataSize<1>(Math::Vector<1, Int>) const; -template std::size_t AbstractImage::dataSize<2>(Math::Vector<2, Int>) const; -template std::size_t AbstractImage::dataSize<3>(Math::Vector<3, Int>) const; +template MAGNUM_EXPORT std::size_t AbstractImage::dataSize<1>(Math::Vector<1, Int>) const; +template MAGNUM_EXPORT std::size_t AbstractImage::dataSize<2>(Math::Vector<2, Int>) const; +template MAGNUM_EXPORT std::size_t AbstractImage::dataSize<3>(Math::Vector<3, Int>) const; } diff --git a/src/Magnum/SceneGraph/Drawable.h b/src/Magnum/SceneGraph/Drawable.h index efa589594..0978a9759 100644 --- a/src/Magnum/SceneGraph/Drawable.h +++ b/src/Magnum/SceneGraph/Drawable.h @@ -280,6 +280,10 @@ typedef BasicDrawableGroup3D DrawableGroup3D; typedef DrawableGroup<3, Float> DrawableGroup3D; #endif +#ifdef CORRADE_TARGET_WINDOWS +extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<2, Float>; +extern template class MAGNUM_SCENEGRAPH_EXPORT Drawable<3, Float>; +#endif }} #endif