Merge pull request #1364 from ManDay/master

Tell Mesa not to attempt X11 headers
This commit is contained in:
Drew DeVault 2018-11-09 15:45:26 -05:00 committed by GitHub
commit ca570fa63c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View file

@ -9,6 +9,12 @@
#ifndef WLR_RENDER_EGL_H #ifndef WLR_RENDER_EGL_H
#define 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/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <pixman.h> #include <pixman.h>

View file

@ -9,6 +9,12 @@
#ifndef WLR_RENDER_INTERFACE_H #ifndef WLR_RENDER_INTERFACE_H
#define 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/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <stdbool.h> #include <stdbool.h>