Browse Source

Fixed linker errors on Windows.

pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
412011f2f8
  1. 6
      src/Magnum/AbstractImage.cpp
  2. 4
      src/Magnum/SceneGraph/Drawable.h

6
src/Magnum/AbstractImage.cpp

@ -146,8 +146,8 @@ template<UnsignedInt dimensions> 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;
}

4
src/Magnum/SceneGraph/Drawable.h

@ -280,6 +280,10 @@ typedef BasicDrawableGroup3D<Float> 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

Loading…
Cancel
Save