From 3add543a221d512c7c6239ae769e088fc9203d9e Mon Sep 17 00:00:00 2001 From: Deve Date: Wed, 30 Nov 2016 21:22:34 +0100 Subject: [PATCH] Fixed conflict between GLES2 headers included in irrlicht and GLES3 headers included in STK. There is one minor difference in one declaration, which is probably an inconsistency in these headers. But it may cause compilation errors on some compiler versions. --- src/graphics/gl_headers.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp index 57c63d027..e02e59fd4 100644 --- a/src/graphics/gl_headers.hpp +++ b/src/graphics/gl_headers.hpp @@ -41,6 +41,7 @@ extern "C" { # define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 # endif #elif defined(USE_GLES2) +# define __gl2_h_ # include # include # include