From 23568028310c59bd07434ea6fedbf501906f87d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 28 Apr 2014 00:02:02 +0200 Subject: [PATCH 1/2] Fix linker errors on MSVC. And probably also on MinGW. --- src/Magnum/MultisampleTexture.h | 4 ++-- src/Magnum/Texture.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/MultisampleTexture.h b/src/Magnum/MultisampleTexture.h index 882aaff60..f622f6d1d 100644 --- a/src/Magnum/MultisampleTexture.h +++ b/src/Magnum/MultisampleTexture.h @@ -44,8 +44,8 @@ namespace Implementation { template<> inline constexpr GLenum multisampleTextureTarget<3>() { return GL_TEXTURE_2D_MULTISAMPLE_ARRAY; } template typename DimensionTraits::VectorType maxMultisampleTextureSize(); - template<> Vector2i maxMultisampleTextureSize<2>(); - template<> Vector3i maxMultisampleTextureSize<3>(); + template<> MAGNUM_EXPORT Vector2i maxMultisampleTextureSize<2>(); + template<> MAGNUM_EXPORT Vector3i maxMultisampleTextureSize<3>(); } /** diff --git a/src/Magnum/Texture.h b/src/Magnum/Texture.h index 84802999e..9986348a0 100644 --- a/src/Magnum/Texture.h +++ b/src/Magnum/Texture.h @@ -53,7 +53,7 @@ namespace Implementation { } template typename DimensionTraits::VectorType maxTextureSize(); - template<> Vector3i maxTextureSize<3>(); + template<> MAGNUM_EXPORT Vector3i maxTextureSize<3>(); } /** From 4d397bf4f3c02fe3cc9322b9cd1d675e712b1f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 28 Apr 2014 00:02:25 +0200 Subject: [PATCH 2/2] Link to proper library on Windows. Probably overdone when prefixing *TestLib libraries. --- src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt index e1f921775..49bf22a76 100644 --- a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt @@ -39,7 +39,7 @@ add_plugin(MagnumFontConverter ${MAGNUM_PLUGINS_FONTCONVERTER_DEBUG_INSTALL_DIR} target_link_libraries(MagnumFontConverter Magnum MagnumText) if(WIN32) - target_link_libraries(MagnumFontConverter MagnumTgaImageConverter) + target_link_libraries(MagnumFontConverter TgaImageConverter) endif() install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFontConverter)