summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@gmail.com>2016-11-26 22:17:17 +0100
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-28 10:59:49 -0500
commit157ab706736389cef1c8b127aac6f61309664286 (patch)
treecd3bdfa838c11311d11ddb890ec0b92546d6f0bc
parent1e85ec41749903eb38817dbb0977dd6435008369 (diff)
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 <romain.naour@gmail.com>
-rw-r--r--src/bin/e_fm/Makefile.mk1
-rw-r--r--src/modules/Makefile.mk1
2 files changed, 2 insertions, 0 deletions
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 = \
9@VALGRIND_CFLAGS@ \ 9@VALGRIND_CFLAGS@ \
10@EDJE_DEF@ \ 10@EDJE_DEF@ \
11@WAYLAND_CFLAGS@ \ 11@WAYLAND_CFLAGS@ \
12@WAYLAND_EGL_CFLAGS@ \
12-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ 13-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
13-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ 14-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
14-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ 15-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index 0962f9ee9..12f74e26b 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -8,6 +8,7 @@ MOD_CPPFLAGS = -I. \
8-I$(top_srcdir)/src/modules \ 8-I$(top_srcdir)/src/modules \
9@e_cflags@ \ 9@e_cflags@ \
10@WAYLAND_CFLAGS@ \ 10@WAYLAND_CFLAGS@ \
11@WAYLAND_EGL_CFLAGS@ \
11-DE_BINDIR=\"$(bindir)\" 12-DE_BINDIR=\"$(bindir)\"
12 13
13MOD_LIBS = @e_libs@ @dlopen_libs@ 14MOD_LIBS = @e_libs@ @dlopen_libs@