From 80a844c6c5256b1c77a04db22f8042891b521c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 18 Jul 2020 10:36:18 +0200 Subject: [PATCH] external: avoid conflicts of our GL headers with GLES3/gl32.h. --- doc/changelog.dox | 2 ++ .../OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template | 1 + src/MagnumExternal/OpenGL/GLES3/flextGL.h | 1 + src/MagnumExternal/OpenGL/GLES3/flextGL.h.template | 1 + src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h | 1 + src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h | 1 + .../OpenGL/GLES3/flextGLWindowsDesktop.h.template | 1 + 7 files changed, 8 insertions(+) diff --git a/doc/changelog.dox b/doc/changelog.dox index 551ce784d..7d19894ff 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -86,6 +86,8 @@ See also: - Fixed compilation of the @ref GL library on macOS with ANGLE --- new code assumed macOS is always desktop GL (see [mosra/magnum#452](https://github.com/mosra/magnum/issues/452)) +- Avoiding conflicts of Magnum's own GL headers with `GLES3/gl32.h` (see + [mosra/magnum#460](https://github.com/mosra/magnum/issues/460)) @subsection changelog-latest-bugfixes Bug fixes diff --git a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template index 384a52224..9d20bf954 100644 --- a/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template @@ -45,6 +45,7 @@ #define __gl2_h_ #define __gl3_h_ #define __gl31_h_ +#define __gl32_h_ #define __gl2ext_h_ #define __gl3ext_h_ #define __gl2platform_h_ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h b/src/MagnumExternal/OpenGL/GLES3/flextGL.h index e586a7b92..3c75a8bc6 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h @@ -47,6 +47,7 @@ #define __gl2_h_ #define __gl3_h_ #define __gl31_h_ +#define __gl32_h_ #define __gl2ext_h_ #define __gl3ext_h_ #define __gl2platform_h_ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template index 49d161695..b01d24f8f 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGL.h.template @@ -48,6 +48,7 @@ #define __gl2_h_ #define __gl3_h_ #define __gl31_h_ +#define __gl32_h_ #define __gl2ext_h_ #define __gl3ext_h_ #define __gl2platform_h_ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h index 3cb9ef2d8..ad53d152e 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h @@ -44,6 +44,7 @@ #define __gl2_h_ #define __gl3_h_ #define __gl31_h_ +#define __gl32_h_ #define __gl2ext_h_ #define __gl3ext_h_ #define __gl2platform_h_ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h index 378b3d744..34517f007 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h @@ -47,6 +47,7 @@ #define __gl2_h_ #define __gl3_h_ #define __gl31_h_ +#define __gl32_h_ #define __gl2ext_h_ #define __gl3ext_h_ #define __gl2platform_h_ diff --git a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template index b8051d7ab..3e4ffd1d6 100644 --- a/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template +++ b/src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template @@ -48,6 +48,7 @@ #define __gl2_h_ #define __gl3_h_ #define __gl31_h_ +#define __gl32_h_ #define __gl2ext_h_ #define __gl3ext_h_ #define __gl2platform_h_