Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines
Modified Files:
Makefile.am
Removed Files:
Evas_Engine_Buffer.h Evas_Engine_FB.h
Evas_Engine_Software_X11.h
Log Message:
1. new engine inheritance scheme - its recursive if u want it to be, and so
far buffer, software_x11 and fb engines use it. need to make allother
software enignes use it next then the gl, cairo, xrender engines, then dfb.
it cuts out a LOT of duplicate code. makes writign a new engine or engine
variant much simpler
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 14 Jan 2006 18:24:41 -0000 1.2
+++ Makefile.am 2 Mar 2006 08:06:09 -0000 1.3
@@ -1,6 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = buffer \
+SUBDIRS = \
+software_generic \
+buffer \
cairo_common \
cairo_x11 \
directfb \
@@ -17,117 +19,54 @@
# self-contained.
EXTRA_DIST = \
-Evas_Engine_Software_X11.h \
Evas_Engine_Software_Xcb.h \
Evas_Engine_DirectFB.h \
-Evas_Engine_FB.h \
-Evas_Engine_Buffer.h \
Evas_Engine_Software_Win32_GDI.h \
Evas_Engine_Software_Qtopia.h \
Evas_Engine_GL_X11.h \
Evas_Engine_Cairo_X11.h \
Evas_Engine_XRender_X11.h
-if BUILD_ENGINE_SOFTWARE_X11
-ENGINE_SOFTWARE_X11 = engines/software_x11/libevas_engine_software_x11.la
-ENGINE_SOFTWARE_X11_INC = Evas_Engine_Software_X11.h
-else
-ENGINE_SOFTWARE_X11 =
-ENGINE_SOFTWARE_X11_INC =
-endif
-
if BUILD_ENGINE_SOFTWARE_XCB
-ENGINE_SOFTWARE_XCB = engines/software_xcb/libevas_engine_software_xcb.la
ENGINE_SOFTWARE_XCB_INC = Evas_Engine_Software_Xcb.h
else
-ENGINE_SOFTWARE_XCB =
ENGINE_SOFTWARE_XCB_INC =
endif
if BUILD_ENGINE_DIRECTFB
-ENGINE_DIRECTFB = engines/directfb/libevas_engine_directfb.la
ENGINE_DIRECTFB_INC = Evas_Engine_DirectFB.h
else
-ENGINE_DIRECTFB =
ENGINE_DIRECTFB_INC =
endif
-if BUILD_ENGINE_FB
-ENGINE_FB = engines/fb/libevas_engine_fb.la
-ENGINE_FB_INC = Evas_Engine_FB.h
-else
-ENGINE_FB =
-ENGINE_FB_INC =
-endif
-
-if BUILD_ENGINE_BUFFER
-ENGINE_BUFFER = engines/buffer/libevas_engine_buffer.la
-ENGINE_BUFFER_INC = Evas_Engine_Buffer.h
-else
-ENGINE_BUFFER =
-ENGINE_BUFFER_INC =
-endif
-
if BUILD_ENGINE_SOFTWARE_QTOPIA
-ENGINE_SOFTWARE_QTOPIA =
-engines/software_qtopia/libevas_engine_software_qtopia.la
ENGINE_SOFTWARE_QTOPIA_INC = Evas_Engine_Software_Qtopia.h
else
-ENGINE_SOFTWARE_QTOPIA =
ENGINE_SOFTWARE_QTOPIA_INC =
endif
-if BUILD_ENGINE_GL_COMMON
-ENGINE_GL_COMMON = engines/gl_common/libevas_engine_gl_common.la
-ENGINE_GL_COMMON_INC =
-else
-ENGINE_GL_COMMON =
-ENGINE_GL_COMMON_INC =
-endif
-
if BUILD_ENGINE_GL_X11
-ENGINE_GL_X11 = engines/gl_x11/libevas_engine_gl_x11.la
ENGINE_GL_X11_INC = Evas_Engine_GL_X11.h
else
-ENGINE_GL_X11 =
ENGINE_GL_X11_INC =
endif
-
-if BUILD_ENGINE_CAIRO_COMMON
-ENGINE_CAIRO_COMMON =
-engines/cairo_common/libevas_engine_cairo_common.la
-ENGINE_CAIRO_COMMON_INC =
-else
-ENGINE_CAIRO_COMMON =
-ENGINE_CAIRO_COMMON_INC =
-endif
if BUILD_ENGINE_CAIRO_X11
-ENGINE_CAIRO_X11 = engines/cairo_x11/libevas_engine_cairo_x11.la
ENGINE_CAIRO_X11_INC = Evas_Engine_Cairo_X11.h
else
-ENGINE_CAIRO_X11 =
ENGINE_CAIRO_X11_INC =
endif
if BUILD_ENGINE_XRENDER_X11
-ENGINE_XRENDER_X11 = engines/xrender_x11/libevas_engine_xrender_x11.la
ENGINE_XRENDER_X11_INC = Evas_Engine_XRender_X11.h
else
-ENGINE_XRENDER_X11 =
ENGINE_XRENDER_X11_INC =
endif
-
include_HEADERS = \
-$(ENGINE_SOFTWARE_X11_INC) \
$(ENGINE_SOFTWARE_XCB_INC) \
$(ENGINE_DIRECTFB_INC) \
-$(ENGINE_FB_INC) \
-$(ENGINE_BUFFER_INC) \
$(ENGINE_SOFTWARE_QTOPIA_INC) \
-$(ENGINE_GL_COMMON_INC) \
$(ENGINE_GL_X11_INC) \
-$(ENGINE_CAIRO_COMMON_INC) \
$(ENGINE_CAIRO_X11_INC) \
$(ENGINE_XRENDER_X11_INC)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
