diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.com> | 2020-01-24 15:11:13 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-01-24 14:56:04 +0000 |
| commit | 6510b2aba1c57c4f9a6768109c003338e3d316bd (patch) | |
| tree | 6b578a9ace0e83e7b73be92e9ee8de9013f0ac91 | |
| parent | d6aa818685a4fd473d38e4b1af0ee5dac4ee5162 (diff) | |
| download | weston-6510b2aba1c57c4f9a6768109c003338e3d316bd.tar.gz | |
build: avoid Xlib.h via EGL headers
This should make EGL headers not pull in Xlib headers when no specific platform
define is in effect.
Use both the old Mesa-specific hack and the new official define EGL_NO_X11 to
have this work on both old and new EGL headers.
Fixes: https://gitlab.freedesktop.org/wayland/weston/issues/350
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
| -rw-r--r-- | meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build index ebd499de..60e21416 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,8 @@ env_modmap = '' config_h.set('_GNU_SOURCE', '1') config_h.set('_ALL_SOURCE', '1') +config_h.set('EGL_NO_X11', '1') +config_h.set('MESA_EGL_NO_X11_HEADERS', '1') config_h.set_quoted('PACKAGE_STRING', 'weston @0@'.format(version_weston)) config_h.set_quoted('PACKAGE_VERSION', version_weston) |