From 3c4ff61e3a5b1ef4995afec704bd4dd04eab5308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 12 Feb 2018 00:22:58 +0100 Subject: [PATCH] external: preserve OpenGL/OpenAL macros in the docs. Or hide them from Doxygen so it doesn't expand them to the numeric values. --- src/MagnumExternal/OpenAL/extensions.h | 4 ++++ src/MagnumExternal/OpenGL/GL/flextGL.h | 4 ++++ src/MagnumExternal/OpenGL/GL/flextGL.h.template | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/MagnumExternal/OpenAL/extensions.h b/src/MagnumExternal/OpenAL/extensions.h index 20882dd03..03d020cac 100644 --- a/src/MagnumExternal/OpenAL/extensions.h +++ b/src/MagnumExternal/OpenAL/extensions.h @@ -38,6 +38,8 @@ extern "C" { #define AL_APIENTRY #endif +#ifndef DOXYGEN_GENERATING_OUTPUT /* So the macro names are preserved in the docs */ + /* AL_EXT_float32 */ #ifndef AL_EXT_float32 #define AL_EXT_float32 1 @@ -116,6 +118,8 @@ typedef ALCchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALCdevice*,ALCenum,ALCsizei); typedef ALCboolean (AL_APIENTRY*LPALRESETDEVICESOFT)(ALCdevice*,const ALCint*); #endif +#endif + #ifdef __cplusplus } #endif diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index f14c9c9af..c735dc8b0 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -37,6 +37,8 @@ extern "C" { #endif +#ifndef DOXYGEN_GENERATING_OUTPUT /* So the macro names are preserved in the docs */ + void flextGLInit(); /* Function declaration macros */ @@ -3674,6 +3676,8 @@ GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglVertexArrayVertexBuffer)(GLuint, GLui GLAPI FLEXTGL_EXPORT void(APIENTRY *flextglVertexArrayVertexBuffers)(GLuint, GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizei *); #define glVertexArrayVertexBuffers flextglVertexArrayVertexBuffers +#endif + #ifdef __cplusplus } #endif diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h.template b/src/MagnumExternal/OpenGL/GL/flextGL.h.template index ac2ace2d5..709a7707e 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h.template @@ -38,6 +38,8 @@ extern "C" { #endif +#ifndef DOXYGEN_GENERATING_OUTPUT /* So the macro names are preserved in the docs */ + void flextGLInit(); /* Function declaration macros */ @@ -96,6 +98,8 @@ GLAPI FLEXTGL_EXPORT @f.returntype\ @end @end +#endif + #ifdef __cplusplus } #endif