Browse Source

Merge branch 'master' into compatibility

Vladimír Vondruš 12 years ago
parent
commit
7e6ac192bc
  1. 4
      src/Magnum/MultisampleTexture.h
  2. 2
      src/Magnum/Texture.h
  3. 2
      src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt

4
src/Magnum/MultisampleTexture.h

@ -44,8 +44,8 @@ namespace Implementation {
template<> inline constexpr GLenum multisampleTextureTarget<3>() { return GL_TEXTURE_2D_MULTISAMPLE_ARRAY; }
template<UnsignedInt dimensions> typename DimensionTraits<dimensions, Int>::VectorType maxMultisampleTextureSize();
template<> Vector2i maxMultisampleTextureSize<2>();
template<> Vector3i maxMultisampleTextureSize<3>();
template<> MAGNUM_EXPORT Vector2i maxMultisampleTextureSize<2>();
template<> MAGNUM_EXPORT Vector3i maxMultisampleTextureSize<3>();
}
/**

2
src/Magnum/Texture.h

@ -53,7 +53,7 @@ namespace Implementation {
}
template<UnsignedInt dimensions> typename DimensionTraits<dimensions, Int>::VectorType maxTextureSize();
template<> Vector3i maxTextureSize<3>();
template<> MAGNUM_EXPORT Vector3i maxTextureSize<3>();
}
/**

2
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)

Loading…
Cancel
Save