Browse Source

Doc++

pull/205/merge
Vladimír Vondruš 8 years ago
parent
commit
2da8e9be71
  1. 4
      doc/building.dox
  2. 4
      src/Magnum/Trade/PhongMaterialData.h

4
doc/building.dox

@ -837,6 +837,10 @@ configured and @ref building-corrade-cross-android "Corrade built for Android".
CMake 3.7 is required, as it has Android support builtin. The supported
toolchain is now Clang with libc++, GCC is not supported anymore.
@attention
You might want to grab at least CMake 3.9.2 instead of just 3.7, as it
[fixes an issue with the Clang toolchain](https://gitlab.kitware.com/cmake/cmake/issues/17253).
Create a build directory and run `cmake` and the build command in it. Set
`CMAKE_SYSTEM_NAME` to `Android` to enable the crosscompilation,
`CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION` and `CMAKE_ANDROID_STL_TYPE` to use Clang

4
src/Magnum/Trade/PhongMaterialData.h

@ -164,10 +164,10 @@ class MAGNUM_EXPORT PhongMaterialData: public AbstractMaterialData {
CORRADE_ENUMSET_OPERATORS(PhongMaterialData::Flags)
/** @debugoperatorclassenum{PhongMaterialData::Flag} */
/** @debugoperatorclassenum{PhongMaterialData,PhongMaterialData::Flag} */
MAGNUM_EXPORT Debug& operator<<(Debug& debug, PhongMaterialData::Flag value);
/** @debugoperatorclassenum{PhongMaterialData::Flags} */
/** @debugoperatorclassenum{PhongMaterialData,PhongMaterialData::Flags} */
MAGNUM_EXPORT Debug& operator<<(Debug& debug, PhongMaterialData::Flags value);
/* Ugly as hell. */

Loading…
Cancel
Save