Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas
Modified Files:
AUTHORS INSTALL configure.in evas.c.in
Added Files:
evas-opengl-glew.pc.in
Log Message:
Glew OpenGL engine added. Windows can have an opengl engine thgough the Glew
library, now. See INSTALL note
===================================================================
RCS file: /cvs/e/e17/libs/evas/AUTHORS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- AUTHORS 24 Apr 2007 11:16:24 -0000 1.13
+++ AUTHORS 5 Aug 2007 07:22:44 -0000 1.14
@@ -12,3 +12,4 @@
Jorge Luis Zapata Muga <[EMAIL PROTECTED]>
Cedric Bail <[EMAIL PROTECTED]>
Gustavo Sverzut Barbieri <[EMAIL PROTECTED]>
+Vincent Torri <vtorri at univ-evry dot fr>
===================================================================
RCS file: /cvs/e/e17/libs/evas/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- INSTALL 27 May 2007 06:48:25 -0000 1.2
+++ INSTALL 5 Aug 2007 07:22:44 -0000 1.3
@@ -11,3 +11,7 @@
That file can be found here:
http://www.koders.com/c/fid2B518462CB1EED3D4E31E271DB83CD1582F6EEBE.aspx
It should be installed in the mingw include directory.
+
+NOTE: for the OpenGL engine on Windows, the glew library:
+http://glew.sourceforge.net/
+ is needed.
===================================================================
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -3 -r1.224 -r1.225
--- configure.in 16 Jul 2007 08:13:40 -0000 1.224
+++ configure.in 5 Aug 2007 07:22:44 -0000 1.225
@@ -236,7 +236,7 @@
AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, test "x$have_evas_software_x11" =
"xyes")
#######################################
-## Check if we should build the software_x11 engine
+## Check if we should build the software_x11 16bit engine
have_evas_software_16_x11="no";
## Automatic check...
# -- disable software_16 by default - its usefulness as a speedup in 16bit
@@ -603,9 +603,54 @@
fi
+#######################################
+## Check if we should build the gl_glew engine
+have_evas_gl_glew="no";
+## Automatic check...
+AC_CHECK_HEADERS(GL/glew.h,
+ [ have_evas_gl_glew="yes" ],
+ [ have_evas_gl_glew="no" ],
+ [
+#include <windows.h>
+ ]
+)
+## manually disable gl engine by default - not auto detected.
+have_evas_gl_glew="no"
+## Manual override
+AC_MSG_CHECKING(whether gl glew backend is to be built)
+AC_ARG_ENABLE(gl-glew, [ --enable-gl-glew enable the OpenGL
Glew display engine], [
+ if test x"$enableval" = x"yes" ; then
+ have_evas_gl_glew="yes"
+ else
+ have_evas_gl_glew="no"
+ fi
+ ]
+)
+AC_MSG_RESULT($have_evas_gl_glew)
+
+if test "x$have_evas_gl_glew" = "xyes"; then
+ AC_CHECK_HEADER(GL/glew.h,
+ [
+ AC_DEFINE(BUILD_ENGINE_GL_GLEW, 1, [OpenGL Glew Rendering Backend])
+ AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
+ glew_libs="-lglew32 -lopengl32 -lgdi32"
+ gl_libs="-lglu32"
+
+ ], [
+ have_evas_gl_glew="no"
+ ],
+ [
+#include <windows.h>
+ ]
+ )
+fi
+AM_CONDITIONAL(BUILD_ENGINE_GL_GLEW, test "x$have_evas_gl_glew" = "xyes")
+AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, test "x$have_evas_gl_glew" = "xyes")
+
+
#######################################
-## Check if we should build the gl_x11 engine
+## Check if we should build the cairo_x11 engine
have_evas_cairo_x11="no";
# Automatic check...
#PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0,
@@ -2068,6 +2113,8 @@
AC_SUBST(ddraw_libs)
+AC_SUBST(glew_libs)
+
AC_SUBST(x_cflags)
AC_SUBST(x_libs)
@@ -2111,6 +2158,7 @@
evas-directfb.pc
evas-framebuffer.pc
evas-glitz-x11.pc
+evas-opengl-glew.pc
evas-opengl-x11.pc
evas-software-buffer.pc
evas-software-qtopia.pc
@@ -2148,6 +2196,7 @@
src/modules/engines/software_qtopia/Makefile
src/modules/engines/directfb/Makefile
src/modules/engines/gl_common/Makefile
+src/modules/engines/gl_glew/Makefile
src/modules/engines/gl_x11/Makefile
src/modules/engines/cairo_common/Makefile
src/modules/engines/cairo_x11/Makefile
@@ -2199,6 +2248,7 @@
echo " Software Memory Buffer..: $have_evas_buffer"
echo " DirectFB................: $have_evas_directfb"
echo " SDL.....................: $have_evas_sdl"
+echo " OpenGL Glew.............: $have_evas_gl_glew"
echo " OpenGL X11..............: $have_evas_gl_x11"
echo " Cairo X11...............: $have_evas_cairo_x11"
echo " XRender X11.............: $have_evas_xrender_x11"
===================================================================
RCS file: /cvs/e/e17/libs/evas/evas.c.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- evas.c.in 19 Jun 2005 13:06:36 -0000 1.30
+++ evas.c.in 5 Aug 2007 07:22:44 -0000 1.31
@@ -13,6 +13,7 @@
@author Yuri Hudobin <[EMAIL PROTECTED]>
@author Nathan Ingersoll <[EMAIL PROTECTED]>
@author Willem Monsuwe <[EMAIL PROTECTED]>
[EMAIL PROTECTED] Vincent Torri <vtorri at univ-evry dot fr>
@date 2000-2003
@section intro What is Evas?
@@ -200,16 +201,14 @@
@todo (1.2) Add loadable image loader module support (evas loads file.so)
@todo (1.2) Add external image lodaer modules (application proivdes path to
file.so)
@todo (1.3) Add X11 primtive engine (ie pixmap)
[EMAIL PROTECTED] (1.3) Add Xrender engine (once xrender works fast/well)
@todo (1.3) Add immediate mode drawing commands to image objects
@todo (1.3) Fix FB engine to allocate vt and release properly
[EMAIL PROTECTED] (1.4) Add SDL Engine
@todo (1.4) Add ellipse objects (circle, arc, ellipse etc.)
@todo (1.5) Make software engine draw lines & polys etc. with aa
@todo (1.5) Add radial gradients to gradient objects
@todo (1.5) Add Symbian Engine
@todo (1.6) Add PalmOS Engine
[EMAIL PROTECTED] (1.6) Add Win32 OpenGL Engine
[EMAIL PROTECTED] (1.6) Add Win32 Direct3D Engine
@todo (1.6) Add Apple OpenGL Engine
@todo (1.7) Document engine API and other internals
@todo (1.7) Allow any object to clip any other object, and not just rectangles
-------------------------------------------------------------------------
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
