Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas
Modified Files:
configure.in Makefile.am
Log Message:
16 bits software directdraw engine. Mainly for win ce users, I guess
===================================================================
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -3 -r1.230 -r1.231
--- configure.in 26 Aug 2007 14:33:40 -0000 1.230
+++ configure.in 8 Oct 2007 19:04:58 -0000 1.231
@@ -170,16 +170,14 @@
AC_MSG_CHECKING(whether software directdraw backend is to be built)
AC_ARG_ENABLE(software-ddraw, AC_HELP_STRING([--enable-software-ddraw],[enable
the Software DirectDraw rendering backend]), [
if test x"$enableval" = x"yes" ; then
- AC_MSG_RESULT(yes)
have_evas_software_ddraw="yes"
else
- AC_MSG_RESULT(no)
have_evas_software_ddraw="no"
fi
- ], [
- AC_MSG_RESULT($have_evas_software_ddraw)
- ]
+ ]
)
+AC_MSG_RESULT($have_evas_software_ddraw)
+
if test "x$have_evas_software_ddraw" = "xyes"; then
AC_CHECK_HEADER(ddraw.h,
[
@@ -194,6 +192,40 @@
fi
AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_DDRAW, test "x$have_evas_software_ddraw"
= "xyes")
+#######################################
+## Check if we should build the 16bit software_ddraw engine
+have_evas_software_16_ddraw="no";
+## Automatic check...
+AC_CHECK_HEADER(ddraw.h,
+ [ have_evas_software_16_ddraw="yes" ],
+ [ have_evas_software_16_ddraw="no" ]
+)
+## Manual override
+AC_MSG_CHECKING(whether 16bit software directdraw backend is to be built)
+AC_ARG_ENABLE(software-16-ddraw,
AC_HELP_STRING([--enable-software-16-ddraw],[enable the 16bit Software
DirectDraw rendering backend]), [
+ if test x"$enableval" = x"yes" ; then
+ have_evas_software_16_ddraw="yes"
+ else
+ have_evas_software_16_ddraw="no"
+ fi
+ ]
+)
+AC_MSG_RESULT($have_evas_software_16_ddraw)
+
+if test "x$have_evas_software_16_ddraw" = "xyes"; then
+ AC_CHECK_HEADER(ddraw.h,
+ [
+ AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_DDRAW, 1, [16bit Software DirectDraw
Rendering Backend])
+ ddraw_16_libs="-lddraw -lgdi32"
+ ],
+ [
+ AC_MSG_RESULT(disabling software DirectDraw engine)
+ have_evas_software_16_ddraw="no"
+ ]
+ )
+fi
+AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16_DDRAW, test
"x$have_evas_software_16_ddraw" = "xyes")
+
#######################################
## Check if we should build the direct3d engine
@@ -317,7 +349,10 @@
### if software 16 x11 is enabled - build software_16 (the generic 16bit
### engine). later enable it fb_16 or other "16" bit engines are enabled.
-have_evas_software_16=$have_evas_software_16_x11
+have_evas_software_16="no"
+if test "x$have_evas_software_16_x11" = "xyes" -o
"x$have_evas_software_16_ddraw" = "xyes"; then
+ have_evas_software_16="yes"
+fi
AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16, test "x$have_evas_software_16" =
"xyes")
#######################################
@@ -2128,6 +2163,7 @@
AC_SUBST(VALGRIND_CFLAGS)
AC_SUBST(ddraw_libs)
+AC_SUBST(ddraw_16_libs)
AC_SUBST(direct3d_libs)
AC_SUBST(glew_libs)
@@ -2185,6 +2221,7 @@
evas-xrender-x11.pc
evas-xrender-xcb.pc
evas-software-ddraw.pc
+evas-software-16-ddraw.pc
evas-direct3d.pc
evas-sdl.pc
evas.pc
@@ -2226,6 +2263,7 @@
src/modules/engines/glitz_x11/Makefile
src/modules/engines/software_16/Makefile
src/modules/engines/software_16_x11/Makefile
+src/modules/engines/software_16_ddraw/Makefile
src/modules/loaders/Makefile
src/modules/loaders/edb/Makefile
src/modules/loaders/eet/Makefile
@@ -2276,6 +2314,7 @@
echo " XRender XCB.............: $have_evas_xrender_xcb"
echo " Glitz X11...............: $have_evas_glitz_x11"
echo " Software 16bit X11......: $have_evas_software_16_x11"
+echo " Software 16bit Directdraw...: $have_evas_software_16_ddraw"
# FIXME: opengl engine needs to be fixed and tested lots for all drivers
# FIXME: xrender engine to be written
echo
===================================================================
RCS file: /cvs/e/e17/libs/evas/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- Makefile.am 17 Aug 2007 09:16:26 -0000 1.44
+++ Makefile.am 8 Oct 2007 19:04:58 -0000 1.45
@@ -21,6 +21,7 @@
evas-xrender-x11.pc \
evas-xrender-xcb.pc \
evas-software-ddraw.pc \
+ evas-software-16-ddraw.pc \
evas-direct3d.pc \
evas-sdl.pc \
evas.pc \
@@ -46,6 +47,7 @@
evas-xrender-x11.pc \
evas-xrender-xcb.pc \
evas-software-ddraw.pc \
+ evas-software-16-ddraw.pc \
evas-direct3d.pc \
evas-sdl.pc \
evas.pc \
@@ -130,6 +132,10 @@
psoftwareddraw = evas-software-ddraw.pc
endif
+if BUILD_ENGINE_SOFTWARE_16_DDRAW
+psoftwared16draw = evas-software-16-ddraw.pc
+endif
+
if BUILD_ENGINE_DIRECT3D
pdirect3d = evas-direct3d.pc
endif
@@ -143,4 +149,4 @@
evas.pc $(psoftwarex11) $(psoftwarexcb) $(pdirectfb) $(pframebuffer) \
$(psoftwarebuffer) $(psoftwareqtopia) $(popenglx11) $(pcairox11) \
$(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) $(psdl) \
- $(psoftware16x11) $(pdirect3d)
+ $(psoftware16x11) $(pdirect3d) $(psoftwared16draw)
-------------------------------------------------------------------------
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
