Browse Source

external: avoid conflicts of our GL headers with GLES3/gl32.h.

pull/461/head
Vladimír Vondruš 6 years ago
parent
commit
80a844c6c5
  1. 2
      doc/changelog.dox
  2. 1
      src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template
  3. 1
      src/MagnumExternal/OpenGL/GLES3/flextGL.h
  4. 1
      src/MagnumExternal/OpenGL/GLES3/flextGL.h.template
  5. 1
      src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h
  6. 1
      src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h
  7. 1
      src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template

2
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

1
src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template vendored

@ -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_

1
src/MagnumExternal/OpenGL/GLES3/flextGL.h vendored

@ -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_

1
src/MagnumExternal/OpenGL/GLES3/flextGL.h.template vendored

@ -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_

1
src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h vendored

@ -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_

1
src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h vendored

@ -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_

1
src/MagnumExternal/OpenGL/GLES3/flextGLWindowsDesktop.h.template vendored

@ -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_

Loading…
Cancel
Save