From 2384d5cccdb020342ad9ad6d40d700c7586acbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 25 Jun 2017 16:20:48 +0200 Subject: [PATCH] external: define also __gl3_h_ in the OpenGL headers. Fixes bad interaction with Qt and system GL headers on macOS. --- src/MagnumExternal/OpenGL/GL/flextGL.h | 1 + src/MagnumExternal/OpenGL/GL/flextGL.h.template | 1 + 2 files changed, 2 insertions(+) diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h b/src/MagnumExternal/OpenGL/GL/flextGL.h index 92148bc94..f14c9c9af 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h @@ -27,6 +27,7 @@ #define __GLEW_H__ #define __gl_h_ #define __GL_H__ +#define __gl3_h_ #define __glext_h_ #define __GLEXT_H_ #define __gltypes_h_ diff --git a/src/MagnumExternal/OpenGL/GL/flextGL.h.template b/src/MagnumExternal/OpenGL/GL/flextGL.h.template index d0d36d364..ac2ace2d5 100644 --- a/src/MagnumExternal/OpenGL/GL/flextGL.h.template +++ b/src/MagnumExternal/OpenGL/GL/flextGL.h.template @@ -28,6 +28,7 @@ #define __GLEW_H__ #define __gl_h_ #define __GL_H__ +#define __gl3_h_ #define __glext_h_ #define __GLEXT_H_ #define __gltypes_h_