jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f8dda3350c9de2ae5bb780c9df9772b9d62c089d

commit f8dda3350c9de2ae5bb780c9df9772b9d62c089d
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Jul 23 16:24:29 2015 +0900

    Evas: Fix wayland-only compilation without Xlib headers
    
    If the Xlib headers are not installed, a special macro must
    be defined before including EGL headers.
---
 src/modules/evas/engines/gl_common/evas_gl_common.h | 4 ++++
 src/modules/evas/engines/gl_drm/evas_engine.h       | 4 ++++
 src/modules/evas/engines/wayland_egl/evas_engine.h  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h 
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 6dc673f..d40833b 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -15,6 +15,10 @@
 
 #define GL_GLEXT_PROTOTYPES
 
+#if !defined(HAVE_ECORE_X_XLIB) && !defined(MESA_EGL_NO_X11_HEADERS)
+# define MESA_EGL_NO_X11_HEADERS
+#endif
+
 #ifdef BUILD_ENGINE_GL_COCOA
 # include <OpenGL/gl.h>
 # include <OpenGL/glext.h>
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h 
b/src/modules/evas/engines/gl_drm/evas_engine.h
index 9578a7b..e2bc8a6 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -10,6 +10,10 @@
 # define EGL_EGLEXT_PROTOTYPES
 # define GL_GLEXT_PROTOTYPES
 
+# if !defined(HAVE_ECORE_X_XLIB) && !defined(MESA_EGL_NO_X11_HEADERS)
+#  define MESA_EGL_NO_X11_HEADERS
+# endif
+
 # include <EGL/egl.h>
 # include <EGL/eglext.h>
 # include <EGL/eglmesaext.h>
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h 
b/src/modules/evas/engines/wayland_egl/evas_engine.h
index 0d22968..9815a16 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -12,6 +12,10 @@
 
 # define GL_GLEXT_PROTOTYPES
 
+# if !defined(HAVE_ECORE_X_XLIB) && !defined(MESA_EGL_NO_X11_HEADERS)
+#  define MESA_EGL_NO_X11_HEADERS
+# endif
+
 # include <EGL/egl.h>
 # include <GLES2/gl2.h>
 # include <GLES2/gl2ext.h>

-- 


Reply via email to