Vladimír Vondruš 7 years ago
parent
commit
c231b8c84c
  1. 2
      doc/building.dox
  2. 2
      doc/changelog-old.dox
  3. 3
      doc/changelog.dox
  4. 1
      doc/platforms-android.dox
  5. 2
      src/Magnum/Animation/Animation.h
  6. 2
      src/Magnum/Audio/Source.h
  7. 2
      src/Magnum/Shapes/AxisAlignedBox.h

2
doc/building.dox

@ -325,7 +325,7 @@ want to set `CMAKE_INSTALL_RPATH` to `lib/` subdir of given prefix (e.g.
@subsection building-windows Building on Windows @subsection building-windows Building on Windows
On Windows you can use either MSVC or the MinGW-w64 compiler. It's then up to On Windows you can use either MSVC or the MinGW-w64 compiler. It's then up to
you whether you will use QtCreator, Visual Studio or anoother IDE or do the you whether you will use QtCreator, Visual Studio or another IDE or do the
build from a command line. Note that for most convenient usage it's best use build from a command line. Note that for most convenient usage it's best use
some dedicated directory (e.g. `C:/Sys`) for installing dependencies instead of some dedicated directory (e.g. `C:/Sys`) for installing dependencies instead of
putting each dependency to its own directory in `C:/Program Files` or putting each dependency to its own directory in `C:/Program Files` or

2
doc/changelog-old.dox

@ -421,7 +421,7 @@ for a high-level overview.
@cpp ImageFormat @ce/@cpp ImageType @ce enums, use `Magnum/ColorFormat.h` @cpp ImageFormat @ce/@cpp ImageType @ce enums, use `Magnum/ColorFormat.h`
header and @cpp ColorFormat @ce/@cpp ColorType @ce enums instead header and @cpp ColorFormat @ce/@cpp ColorType @ce enums instead
- Removed deprecated @cpp Matrix2 @ce and @cpp Matrix2d @ce typedefs, use - Removed deprecated @cpp Matrix2 @ce and @cpp Matrix2d @ce typedefs, use
:ref:`Matrix2x2` and :ref:`Matrix2x2d` instead @ref Matrix2x2 and @ref Matrix2x2d instead
- Removed deprecated `Magnum/Swizzle.h` header and @cpp Magnum::swizzle() @ce - Removed deprecated `Magnum/Swizzle.h` header and @cpp Magnum::swizzle() @ce
function, use @ref Magnum/Math/Swizzle.h and @ref Math::swizzle() function, use @ref Magnum/Math/Swizzle.h and @ref Math::swizzle()
instead instead

3
doc/changelog.dox

@ -127,7 +127,8 @@ See also:
- Experimental support for creating Android APKs directly using CMake without - Experimental support for creating Android APKs directly using CMake without
Gradle involved. See @ref platforms-android-apps for more information. See Gradle involved. See @ref platforms-android-apps for more information. See
also [mosra/toolchains#5](https://github.com/mosra/toolchains/pull/5). also [mosra/toolchains#5](https://github.com/mosra/toolchains/pull/5) and
[mosra/toolchains#6](https://github.com/mosra/toolchains/pull/6).
- Initial scaffolding for [Hunter](https://hunter.sh) package support (see - Initial scaffolding for [Hunter](https://hunter.sh) package support (see
[mosra/magnum#298](https://github.com/mosra/magnum/pull/298)) [mosra/magnum#298](https://github.com/mosra/magnum/pull/298))
- The `Magnum::AndroidApplication` target was missing a few dependency - The `Magnum::AndroidApplication` target was missing a few dependency

1
doc/platforms-android.dox

@ -30,6 +30,7 @@ namespace Magnum {
@tableofcontents @tableofcontents
@m_footernavigation @m_footernavigation
@m_keywords{android_create_apk()}
@todoc code coverage @todoc code coverage
@todoc static plugins @todoc static plugins

2
src/Magnum/Animation/Animation.h

@ -33,6 +33,7 @@
namespace Magnum { namespace Animation { namespace Magnum { namespace Animation {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class V> struct ResultTraits; template<class V> struct ResultTraits;
template<class, class> struct TypeTraits; template<class, class> struct TypeTraits;
@ -48,6 +49,7 @@ template<class T, class K = T> class Player;
template<class K, class V, class R = ResultOf<V>> class Track; template<class K, class V, class R = ResultOf<V>> class Track;
template<class K> class TrackViewStorage; template<class K> class TrackViewStorage;
template<class K, class V, class R = ResultOf<V>> class TrackView; template<class K, class V, class R = ResultOf<V>> class TrackView;
#endif
}} }}

2
src/Magnum/Audio/Source.h

@ -418,7 +418,7 @@ class MAGNUM_AUDIO_EXPORT Source {
* Has effect only if the source is directional. Default is * Has effect only if the source is directional. Default is
* @cpp 360.0_degf @ce. * @cpp 360.0_degf @ce.
* @see @ref setInnerConeAngle(), @ref setDirection(), * @see @ref setInnerConeAngle(), @ref setDirection(),
* @ref setOuterConeGain() @fn_al_keyword{Sourcef} with * @ref setOuterConeGain(), @fn_al_keyword{Sourcef} with
* @def_al{CONE_OUTER_ANGLE} * @def_al{CONE_OUTER_ANGLE}
*/ */
Source& setOuterConeAngle(Deg angle) { Source& setOuterConeAngle(Deg angle) {

2
src/Magnum/Shapes/AxisAlignedBox.h

@ -26,7 +26,7 @@
*/ */
/** @file /** @file
@brief Class @ref Magnum::Shapes::AxisAlignedBox, typedef @ref Magnum::Shapes::AxisAlignedBox2D, @ref Magnum::Shapes.:AxisAlignedBox3D @brief Class @ref Magnum::Shapes::AxisAlignedBox, typedef @ref Magnum::Shapes::AxisAlignedBox2D, @ref Magnum::Shapes::AxisAlignedBox3D
@deprecated The @ref Magnum::Shapes library is a failed design experiment and @deprecated The @ref Magnum::Shapes library is a failed design experiment and
is scheduled for removal in a future release. Related geometry algorithms is scheduled for removal in a future release. Related geometry algorithms

Loading…
Cancel
Save