From c8f5f942d0d5b85b0ae746cdd7cb57e2c8e1012f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 26 Nov 2016 22:17:17 +0100 Subject: [PATCH] E: fix Wayland without xwayland build When building enlightement without xwayland, we need to provide MESA_EGL_NO_X11_HEADERS in the CFLAGS to avoid including X11/Xlib.h. This define is provided by WAYLAND_EGL_CFLAGS, so add it for E modules and e_fm build. Fixes: In file included from /usr/include/EGL/egl.h:39:0, from ./src/bin/e.h:108, from src/modules/mixer/lib/backends/pulseaudio/pulse.c:1: /usr/include/EGL/eglplatform.h:119:22: erreur fatale : X11/Xlib.h Signed-off-by: Romain Naour --- src/bin/e_fm/Makefile.mk | 1 + src/modules/Makefile.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bin/e_fm/Makefile.mk b/src/bin/e_fm/Makefile.mk index 218329f31..63c35c147 100644 --- a/src/bin/e_fm/Makefile.mk +++ b/src/bin/e_fm/Makefile.mk @@ -9,6 +9,7 @@ EFM_CPPFLAGS = \ @VALGRIND_CFLAGS@ \ @EDJE_DEF@ \ @WAYLAND_CFLAGS@ \ +@WAYLAND_EGL_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index ed74f598c..fc7ace3a6 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -8,6 +8,7 @@ MOD_CPPFLAGS = -I. \ -I$(top_srcdir)/src/modules \ @e_cflags@ \ @WAYLAND_CFLAGS@ \ +@WAYLAND_EGL_CFLAGS@ \ -DE_BINDIR=\"$(bindir)\" MOD_LIBS = @e_libs@ @dlopen_libs@