From 5fa99edb7a611eb19db711f595f112a1e0894827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 2 Nov 2021 16:13:02 +0100 Subject: [PATCH] Platform: fix compilation with latest EGL headers / libglvnd 1.3.4. Yay, X11 headers being optional now. Happy about this change even though it caused a breakage. https://github.com/KhronosGroup/EGL-Registry/pull/130 --- .../Platform/Implementation/EglContextHandler.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h index 9854f174c..007e2007f 100644 --- a/src/Magnum/Platform/Implementation/EglContextHandler.h +++ b/src/Magnum/Platform/Implementation/EglContextHandler.h @@ -25,8 +25,17 @@ DEALINGS IN THE SOFTWARE. */ +/* OpenGL ES on BeagleBoard needs this (originally added in August 2012). Not + sure if that's still the case, but given that USE_X11 is needed below, it's + not unlikely they did the same thing 9 years earlier. */ #ifndef SUPPORT_X11 -#define SUPPORT_X11 // OpenGL ES on BeagleBoard needs this (?) +#define SUPPORT_X11 +#endif +/* This is needed since https://github.com/KhronosGroup/EGL-Registry/pull/130 + (and libglvnd 1.3.4), otherwise EGLNativeDisplayType is void* and not + Display*. */ +#ifndef USE_X11 +#define USE_X11 #endif #include /* undef Xlib nonsense to avoid conflicts */