Merge pull request #1364 from ManDay/master

Tell Mesa not to attempt X11 headers
6 years ago · ca570fa63c
parent e70a552203 beefec3326
commit ca570fa63c
2 changed files with 12 additions and 0 deletions
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@ -9,6 +9,12 @@
 #ifndef WLR_RENDER_EGL_H
 #define WLR_RENDER_EGL_H

+#include <wlr/config.h>
+
+#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND))
+#define MESA_EGL_NO_X11_HEADERS
+#endif
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <pixman.h>
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@ -9,6 +9,12 @@
 #ifndef WLR_RENDER_INTERFACE_H
 #define WLR_RENDER_INTERFACE_H

+#include <wlr/config.h>
+
+#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND))
+#define MESA_EGL_NO_X11_HEADERS
+#endif
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <stdbool.h>