ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

external: print an error when gl32.h is encountered as well. 

Followup to 80a844c6c5, forgot this
initially.
pull/435/merge
Vladimír Vondruš 6 years ago
parent
f225497475
commit
23698eed7b
4 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template
  2. 2
      src/MagnumExternal/OpenGL/GLES3/flextGL.h
  3. 2
      src/MagnumExternal/OpenGL/GLES3/flextGL.h.template
  4. 2
      src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h

2
src/MagnumExternal/OpenGL/GLES3/Emscripten/flextGLEmscripten.h.template vendored
Unescape View File

@ -31,7 +31,7 @@
/* Defensive include guards */ /* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) #if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_)
#error Attempt to include auto-generated header after including gl3.h #error Attempt to include auto-generated header after including gl3.h
#endif #endif
#if defined(__gl2ext_h_) || defined(__gl3ext_h_) #if defined(__gl2ext_h_) || defined(__gl3ext_h_)

2
src/MagnumExternal/OpenGL/GLES3/flextGL.h vendored
Unescape View File

@ -33,7 +33,7 @@
/* Defensive include guards */ /* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) #if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_)
#error Attempt to include auto-generated header after including gl3.h #error Attempt to include auto-generated header after including gl3.h
#endif #endif
#if defined(__gl2ext_h_) || defined(__gl3ext_h_) #if defined(__gl2ext_h_) || defined(__gl3ext_h_)

2
src/MagnumExternal/OpenGL/GLES3/flextGL.h.template vendored
Unescape View File

@ -34,7 +34,7 @@
/* Defensive include guards */ /* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) #if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_)
#error Attempt to include auto-generated header after including gl3.h #error Attempt to include auto-generated header after including gl3.h
#endif #endif
#if defined(__gl2ext_h_) || defined(__gl3ext_h_) #if defined(__gl2ext_h_) || defined(__gl3ext_h_)

2
src/MagnumExternal/OpenGL/GLES3/flextGLEmscripten.h vendored
Unescape View File

@ -30,7 +30,7 @@
/* Defensive include guards */ /* Defensive include guards */
#if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) #if defined(__gl_h_) || defined(__gl2_h_) || defined(__gl3_h_) || defined(__gl31_h_) || defined(__gl32_h_)
#error Attempt to include auto-generated header after including gl3.h #error Attempt to include auto-generated header after including gl3.h
#endif #endif
#if defined(__gl2ext_h_) || defined(__gl3ext_h_) #if defined(__gl2ext_h_) || defined(__gl3ext_h_)

Write Preview
Loading…
Cancel
Save