From a40d30e21802ecf5c9382cf34af9b01bd3781e47 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Fri, 7 Dec 2018 03:23:44 +0100 Subject: [PATCH] opengl: fix compilation with Mesa 18.2.5 and later Mesa headers have been updated and changed some defines that Allegro is hackily relying on. https://gitlab.freedesktop.org/mesa/mesa/commit/f7d42ee7d319256608ad60778f6787c140badada --- include/allegro5/allegro_opengl.h | 4 ++++ include/allegro5/opengl/GLext/glx_ext_defs.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/allegro5/allegro_opengl.h b/include/allegro5/allegro_opengl.h index 0f86a6768..652dd024e 100644 --- a/addons/allegrogl/include/alleggl.h +++ b/addons/allegrogl/include/alleggl.h @@ -103,10 +103,14 @@ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ #define __glext_h_ +#define __gl_glext_h_ #define __glxext_h_ +#define __glx_glxext_h_ #include #undef __glext_h_ +#undef __gl_glext_h_ #undef __glxext_h_ +#undef __glx_glxext_h_ #endif /* ALLEGRO_MACOSX */ diff --git a/include/allegro5/opengl/GLext/glx_ext_defs.h b/include/allegro5/opengl/GLext/glx_ext_defs.h index 49c502091..fba8aea5d 100644 --- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h +++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h @@ -1,7 +1,9 @@ /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ #define __glxext_h_ +#define __glx_glxext_h_ #include #undef __glxext_h_ +#undef __glx_glxext_h_ #ifndef GLX_VERSION_1_3 #define _ALLEGRO_GLX_VERSION_1_3