diff --git a/Doxyfile b/Doxyfile index 36e01d7a1..4b8f5e074 100644 --- a/Doxyfile +++ b/Doxyfile @@ -2006,7 +2006,10 @@ SEARCH_INCLUDES = YES # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = +INCLUDE_PATH = src \ + ../magnum-plugins/src \ + ../magnum-extras/src \ + ../magnum-integration/src # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the @@ -2026,20 +2029,8 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = DOXYGEN_GENERATING_OUTPUT \ CORRADE_DEPRECATED(message)= CORRADE_DEPRECATED_ALIAS(message)= \ - CORRADE_DEPRECATED_ENUM(message)= \ - MAGNUM_BUILD_DEPRECATED \ - MAGNUM_EXPORT= \ - MAGNUM_AUDIO_EXPORT= \ - MAGNUM_DEBUGTOOLS_EXPORT= \ - MAGNUM_MATH_EXPORT= \ - MAGNUM_MESHTOOLS_EXPORT= \ - MAGNUM_PLATFORM_EXPORT= \ - MAGNUM_PRIMITIVES_EXPORT= \ - MAGNUM_SCENEGRAPH_EXPORT= \ - MAGNUM_SHADERS_EXPORT= \ - MAGNUM_SHAPES_EXPORT= \ - MAGNUM_TEXT_EXPORT= \ - MAGNUM_TEXTURETOOLS_EXPORT= + CORRADE_DEPRECATED_ENUM(message)= CORRADE_ENUMSET_OPERATORS(message)= \ + MAGNUM_BUILD_DEPRECATED # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this # tag can be used to specify a list of macro names that should be expanded. The diff --git a/src/Magnum/Audio/visibility.h b/src/Magnum/Audio/visibility.h index 8fc420e59..09b793478 100644 --- a/src/Magnum/Audio/visibility.h +++ b/src/Magnum/Audio/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumAudio_EXPORTS #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_EXPORT @@ -39,5 +40,9 @@ #define MAGNUM_AUDIO_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_AUDIO_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_AUDIO_EXPORT +#define MAGNUM_AUDIO_LOCAL +#endif #endif diff --git a/src/Magnum/DebugTools/visibility.h b/src/Magnum/DebugTools/visibility.h index 13f0e1fb6..6582ffa0f 100644 --- a/src/Magnum/DebugTools/visibility.h +++ b/src/Magnum/DebugTools/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumDebugTools_EXPORTS #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT @@ -38,5 +39,8 @@ #else #define MAGNUM_DEBUGTOOLS_EXPORT CORRADE_VISIBILITY_STATIC #endif +#else +#define MAGNUM_DEBUGTOOLS_EXPORT +#endif #endif diff --git a/src/Magnum/MeshTools/visibility.h b/src/Magnum/MeshTools/visibility.h index daf439e29..759c073c4 100644 --- a/src/Magnum/MeshTools/visibility.h +++ b/src/Magnum/MeshTools/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_EXPORT @@ -38,5 +39,8 @@ #else #define MAGNUM_MESHTOOLS_EXPORT CORRADE_VISIBILITY_STATIC #endif +#else +#define MAGNUM_MESHTOOLS_EXPORT +#endif #endif diff --git a/src/Magnum/Primitives/visibility.h b/src/Magnum/Primitives/visibility.h index d6d9e40f7..31b308d9f 100644 --- a/src/Magnum/Primitives/visibility.h +++ b/src/Magnum/Primitives/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumPrimitives_EXPORTS #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_EXPORT @@ -38,5 +39,8 @@ #else #define MAGNUM_PRIMITIVES_EXPORT CORRADE_VISIBILITY_STATIC #endif +#else +#define MAGNUM_PRIMITIVES_EXPORT +#endif #endif diff --git a/src/Magnum/SceneGraph/visibility.h b/src/Magnum/SceneGraph/visibility.h index 47b3df65d..4dbe69ab4 100644 --- a/src/Magnum/SceneGraph/visibility.h +++ b/src/Magnum/SceneGraph/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_EXPORT @@ -39,5 +40,9 @@ #define MAGNUM_SCENEGRAPH_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_SCENEGRAPH_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_SCENEGRAPH_EXPORT +#define MAGNUM_SCENEGRAPH_LOCAL +#endif #endif diff --git a/src/Magnum/Shaders/visibility.h b/src/Magnum/Shaders/visibility.h index b24357258..68c4f0d93 100644 --- a/src/Magnum/Shaders/visibility.h +++ b/src/Magnum/Shaders/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Shaders_magnumShadersVisibility_h -#define Magnum_Shaders_magnumShadersVisibility_h +#ifndef Magnum_Shaders_visibility_h +#define Magnum_Shaders_visibility_h /* This file is part of Magnum. @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShaders_EXPORTS #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_EXPORT @@ -38,5 +39,8 @@ #else #define MAGNUM_SHADERS_EXPORT CORRADE_VISIBILITY_STATIC #endif +#else +#define MAGNUM_SHADERS_EXPORT +#endif #endif diff --git a/src/Magnum/Shapes/visibility.h b/src/Magnum/Shapes/visibility.h index 045885b34..34883033e 100644 --- a/src/Magnum/Shapes/visibility.h +++ b/src/Magnum/Shapes/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShapes_EXPORTS #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_EXPORT @@ -39,5 +40,9 @@ #define MAGNUM_SHAPES_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_SHAPES_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_SHAPES_EXPORT +#define MAGNUM_SHAPES_LOCAL +#endif #endif diff --git a/src/Magnum/Text/visibility.h b/src/Magnum/Text/visibility.h index 749bbb42c..2aa74ec4f 100644 --- a/src/Magnum/Text/visibility.h +++ b/src/Magnum/Text/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumText_EXPORTS #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_EXPORT @@ -39,5 +40,9 @@ #define MAGNUM_TEXT_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_TEXT_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_TEXT_EXPORT +#define MAGNUM_TEXT_LOCAL +#endif #endif diff --git a/src/Magnum/visibility.h b/src/Magnum/visibility.h index 8a403c469..c967c0c62 100644 --- a/src/Magnum/visibility.h +++ b/src/Magnum/visibility.h @@ -29,6 +29,7 @@ #include "Magnum/configure.h" +#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef MAGNUM_BUILD_STATIC #if defined(Magnum_EXPORTS) || defined(MagnumMathObjects_EXPORTS) #define MAGNUM_EXPORT CORRADE_VISIBILITY_EXPORT @@ -39,5 +40,9 @@ #define MAGNUM_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_EXPORT +#define MAGNUM_LOCAL +#endif #endif diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.h b/src/MagnumPlugins/MagnumFont/MagnumFont.h index 1bcff3830..f54886556 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.h +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.h @@ -45,6 +45,9 @@ #define MAGNUM_MAGNUMFONT_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_MAGNUMFONT_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_MAGNUMFONT_EXPORT +#define MAGNUM_MAGNUMFONT_LOCAL #endif namespace Magnum { namespace Text { diff --git a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h index fabf63249..dff557eda 100644 --- a/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h +++ b/src/MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h @@ -44,6 +44,9 @@ #define MAGNUM_MAGNUMFONTCONVERTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_MAGNUMFONTCONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_MAGNUMFONTCONVERTER_EXPORT +#define MAGNUM_MAGNUMFONTCONVERTER_LOCAL #endif namespace Magnum { namespace Text { diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.h b/src/MagnumPlugins/ObjImporter/ObjImporter.h index 680b9db3d..e801915f6 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.h +++ b/src/MagnumPlugins/ObjImporter/ObjImporter.h @@ -44,6 +44,9 @@ #define MAGNUM_OBJIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_OBJIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_OBJIMPORTER_EXPORT +#define MAGNUM_OBJIMPORTER_LOCAL #endif namespace Magnum { namespace Trade { diff --git a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h index a40469dd1..33ae17668 100644 --- a/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h +++ b/src/MagnumPlugins/TgaImageConverter/TgaImageConverter.h @@ -44,6 +44,9 @@ #define MAGNUM_TGAIMAGECONVERTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_TGAIMAGECONVERTER_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_TGAIMAGECONVERTER_EXPORT +#define MAGNUM_TGAIMAGECONVERTER_LOCAL #endif namespace Magnum { namespace Trade { diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.h b/src/MagnumPlugins/TgaImporter/TgaImporter.h index ae97614d9..4e2953283 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.h +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.h @@ -47,6 +47,9 @@ #define MAGNUM_TGAIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_TGAIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_TGAIMPORTER_EXPORT +#define MAGNUM_TGAIMPORTER_LOCAL #endif namespace Magnum { namespace Trade { diff --git a/src/MagnumPlugins/WavAudioImporter/WavImporter.h b/src/MagnumPlugins/WavAudioImporter/WavImporter.h index 5c523b536..de5febc05 100644 --- a/src/MagnumPlugins/WavAudioImporter/WavImporter.h +++ b/src/MagnumPlugins/WavAudioImporter/WavImporter.h @@ -47,6 +47,9 @@ #define MAGNUM_WAVAUDIOIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC #endif #define MAGNUM_WAVAUDIOIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL +#else +#define MAGNUM_WAVAUDIOIMPORTER_EXPORT +#define MAGNUM_WAVAUDIOIMPORTER_LOCAL #endif namespace Magnum { namespace Audio {