From b8fe2fb6c3ef2d72094f29db47e4f168d71af25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 1 May 2018 12:39:43 +0200 Subject: [PATCH] Platform: don't include the GL headers in GlfwApplication header. So it's possible to use it with custom GL extension loaders. This is done for SDL2 already. --- src/Magnum/Platform/GlfwApplication.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h index eccc2a956..584f564da 100644 --- a/src/Magnum/Platform/GlfwApplication.h +++ b/src/Magnum/Platform/GlfwApplication.h @@ -41,10 +41,9 @@ #ifdef MAGNUM_TARGET_GL #include "Magnum/GL/GL.h" -/* We must include our own GL headers first to avoid conflicts */ -#include "Magnum/GL/OpenGL.h" #endif +#define GLFW_INCLUDE_NONE #include namespace Magnum { namespace Platform {