Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Ecore_Evas.h ecore_evas.c ecore_evas_private.h ecore_evas_x.c
Log Message:
Rename GL to X11_GL, as there might come other GL engines.
Use PKG_CHECK_EXISTS to check for evas engines.
Only check for ecore_evas_x engines if we build ecore_x.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- Ecore_Evas.h 3 Oct 2007 06:31:05 -0000 1.33
+++ Ecore_Evas.h 5 Nov 2007 20:23:39 -0000 1.34
@@ -50,7 +50,7 @@
*/
#define HAVE_ECORE_EVAS_X 1
#define HAVE_ECORE_EVAS_FB 1
-#define HAVE_ECORE_EVAS_GL 1
+#define HAVE_ECORE_EVAS_X11_GL 1
#define HAVE_ECORE_EVAS_X11_16 1
#define HAVE_ECORE_EVAS_DIRECTFB 1
#define HAVE_ECORE_EVAS_WIN32 1
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ecore_evas.c 3 Oct 2007 06:31:05 -0000 1.41
+++ ecore_evas.c 5 Nov 2007 20:23:39 -0000 1.42
@@ -32,7 +32,7 @@
return 0;
#endif
case ECORE_EVAS_ENGINE_GL_X11:
-#ifdef BUILD_ECORE_EVAS_GL
+#ifdef BUILD_ECORE_EVAS_X11_GL
return 1;
#else
return 0;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ecore_evas_private.h 3 Oct 2007 06:31:05 -0000 1.34
+++ ecore_evas_private.h 5 Nov 2007 20:23:39 -0000 1.35
@@ -40,7 +40,7 @@
# ifdef ECORE_XRENDER
# include <X11/extensions/Xrender.h>
# endif
-# ifdef BUILD_ECORE_EVAS_GL
+# ifdef BUILD_ECORE_EVAS_X11_GL
# include <Evas_Engine_GL_X11.h>
# endif
# ifdef BUILD_ECORE_EVAS_XRENDER
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- ecore_evas_x.c 5 Nov 2007 18:31:05 -0000 1.115
+++ ecore_evas_x.c 5 Nov 2007 20:23:39 -0000 1.116
@@ -47,7 +47,7 @@
}
#endif /* HAVE_ECORE_X_XCB*/
-#ifdef BUILD_ECORE_EVAS_GL
+#ifdef BUILD_ECORE_EVAS_X11_GL
# ifdef HAVE_ECORE_X_XCB
/* noop */
# else
@@ -2329,7 +2329,7 @@
}
else if (!strcmp(ee->driver, "gl_x11"))
{
-#ifdef BUILD_ECORE_EVAS_GL
+#ifdef BUILD_ECORE_EVAS_X11_GL
Evas_Engine_Info_GL_X11 *einfo;
einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas);
@@ -2920,7 +2920,7 @@
ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h)
{
-#ifdef BUILD_ECORE_EVAS_GL
+#ifdef BUILD_ECORE_EVAS_X11_GL
# ifdef HAVE_ECORE_X_XCB
Ecore_Evas *ee = NULL;
# else
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
