Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas


Modified Files:
        Makefile.am configure.in 
Added Files:
        evas-software-16-wince.pc.in 


Log Message:
 * Add Windows CE engine (1st step)

  The engine is not entirely working right now. Recent devices which
  supports the raw frame buffer should work though. But having it in
  cvs will help me as I'm coding it most of the time "blindly" (no
  device to test it)

 * minor formatting in the top evel Makefile.am too


===================================================================
RCS file: /cvs/e/e17/libs/evas/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- Makefile.am 11 Apr 2008 23:41:44 -0000      1.51
+++ Makefile.am 23 Apr 2008 19:17:58 -0000      1.52
@@ -2,58 +2,80 @@
 
 SUBDIRS = src
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
-                       config.h.in config.sub configure install-sh \
-                      ltconfig ltmain.sh missing mkinstalldirs \
-                      stamp-h.in build-stamp configure-stamp depcomp \
-                      evas_docs.tar.gz evas.c \
-                      README \
-                      evas-cairo-x11.pc \
-                      evas-directfb.pc \
-                      evas-fb.pc \
-                      evas-glitz-x11.pc \
-                      evas-opengl-x11.pc \
-                      evas-opengl-glew.pc \
-                      evas-software-buffer.pc \
-                      evas-software-qtopia.pc \
-                      evas-software-x11.pc \
-                      evas-software-16-x11.pc \
-                      evas-software-xcb.pc \
-                      evas-xrender-x11.pc \
-                      evas-xrender-xcb.pc \
-                      evas-software-ddraw.pc \
-                      evas-software-16-ddraw.pc \
-                      evas-direct3d.pc \
-                      evas-software-sdl.pc \
-                      evas.pc \
-                      evas.spec
-
-bin_SCRIPTS = 
-
-EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN autogen.sh evas.c.in gendoc \
-             Doxyfile \
-            README.in README \
-            evas.pc.in \
-            evas-cairo-x11.pc \
-            evas-directfb.pc \
-            evas-fb.pc \
-            evas-glitz-x11.pc \
-            evas-opengl-x11.pc \
-            evas-opengl-glew.pc \
-            evas-software-buffer.pc \
-            evas-software-qtopia.pc \
-            evas-software-x11.pc \
-            evas-software-16-x11.pc \
-            evas-software-xcb.pc \
-            evas-xrender-x11.pc \
-            evas-xrender-xcb.pc \
-            evas-software-ddraw.pc \
-            evas-software-16-ddraw.pc \
-            evas-direct3d.pc \
-            evas-software-sdl.pc \
-            evas.pc \
-            evas.spec.in evas.spec \
-            doc gendoc
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+config.guess \
+config.h.in \
+config.sub \
+configure \
+install-sh \
+ltconfig \
+ltmain.sh \
+missing \
+mkinstalldirs \
+stamp-h.in \
+build-stamp \
+configure-stamp \
+depcomp \
+evas_docs.tar.gz \
+evas.c \
+README \
+evas-cairo-x11.pc \
+evas-directfb.pc \
+evas-fb.pc \
+evas-glitz-x11.pc \
+evas-opengl-x11.pc \
+evas-opengl-glew.pc \
+evas-software-buffer.pc \
+evas-software-qtopia.pc \
+evas-software-x11.pc \
+evas-software-16-x11.pc \
+evas-software-xcb.pc \
+evas-xrender-x11.pc \
+evas-xrender-xcb.pc \
+evas-software-ddraw.pc \
+evas-software-16-ddraw.pc \
+evas-direct3d.pc \
+evas-software-16-wince.pc \
+evas-software-sdl.pc \
+evas.pc \
+evas.spec
+
+bin_SCRIPTS =
+
+EXTRA_DIST = \
+AUTHORS \
+COPYING \
+COPYING-PLAIN \
+autogen.sh \
+evas.c.in \
+gendoc \
+Doxyfile \
+README.in \
+README \
+evas.pc.in \
+evas-cairo-x11.pc \
+evas-directfb.pc \
+evas-fb.pc \
+evas-glitz-x11.pc \
+evas-opengl-x11.pc \
+evas-opengl-glew.pc \
+evas-software-buffer.pc \
+evas-software-qtopia.pc \
+evas-software-x11.pc \
+evas-software-16-x11.pc \
+evas-software-xcb.pc \
+evas-xrender-x11.pc \
+evas-xrender-xcb.pc \
+evas-software-ddraw.pc \
+evas-software-16-ddraw.pc \
+evas-direct3d.pc \
+evas-software-16-wince.pc \
+evas-software-sdl.pc \
+evas.pc \
+evas.spec.in evas.spec \
+doc gendoc
 
 if BUILD_ENGINE_SOFTWARE_X11
 psoftwarex11 = evas-software-x11.pc
@@ -112,13 +134,17 @@
 endif
 
 if BUILD_ENGINE_SOFTWARE_16_DDRAW
-psoftwared16draw = evas-software-16-ddraw.pc
+psoftware16ddraw = evas-software-16-ddraw.pc
 endif
 
 if BUILD_ENGINE_DIRECT3D
 pdirect3d = evas-direct3d.pc
 endif
 
+if BUILD_ENGINE_SOFTWARE_16_WINCE
+psoftware16wince = evas-software-16-wince.pc
+endif
+
 if BUILD_ENGINE_SDL
 psoftwaresdl = evas-software-sdl.pc
 endif
@@ -128,4 +154,4 @@
        evas.pc $(psoftwarex11) $(psoftwarexcb) $(pdirectfb) $(pfb) \
        $(psoftwarebuffer) $(psoftwareqtopia) $(popenglx11) $(pcairox11) \
        $(pxrenderx11) $(pxrenderxcb) $(pglitzx11) $(psoftwareddraw) 
$(psoftwaresdl) \
-       $(psoftware16x11) $(pdirect3d) $(psoftwared16draw) $(popenglglew)
+       $(psoftware16x11) $(pdirect3d) $(psoftware16ddraw) $(psoftware16wince) 
$(popenglglew)
===================================================================
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -3 -r1.254 -r1.255
--- configure.in        23 Apr 2008 06:55:06 -0000      1.254
+++ configure.in        23 Apr 2008 19:17:58 -0000      1.255
@@ -41,7 +41,7 @@
 lt_no_undefined=""
 lt_enable_auto_import=""
 case "$host_os" in
-        mingw|mingw32*|cegcc)
+        mingw*|cegcc*)
                PKG_CHECK_MODULES(EVIL, evil)
                AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
                dnl needed for correct definition of EAPI
@@ -134,8 +134,8 @@
 
 dlopen_libs=""
 case "$host_os" in
-  mingw|mingw32)
-    AC_CHECK_HEADER(windows.h, [], [AC_MSG_ERROR(Cannot find windows.h)])
+  mingw*|cegcc*)
+dnl managed by evil
   ;;
   *)
     AC_CHECK_FUNCS(dlopen, res=yes, res=no)
@@ -267,6 +267,37 @@
 
 
 #######################################
+## Check if we should build the 16bit software_wince engine
+want_evas_software_16_wince="auto";
+have_evas_software_16_wince="no";
+
+AC_MSG_CHECKING(whether 16 bit software WinCE backend is to be built)
+AC_ARG_ENABLE(software-16-wince,
+  AC_HELP_STRING([--enable-software-16-wince], [enable the 16bit Software 
WinCE rendering backend]),
+  [ want_evas_software_16_wince=$enableval ]
+)
+AC_MSG_RESULT($want_evas_software_16_wince)
+
+if test "x$want_evas_software_16_wince" = "xyes" -o 
"x$want_evas_software_16_wince" = "xauto"; then
+  AC_CHECK_HEADER(windows.h,
+    [
+      AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_WINCE, 1, [16bit Software WinCE 
Rendering Backend])
+      wince_16_libs=""
+      have_evas_software_16_wince="yes"
+    ],
+    [
+      if test "x$want_evas_software_16_wince"  = "xyes" -a "x$use_strict" = 
"xyes" ; then
+        AC_MSG_ERROR([WinCE not found (strict dependencies checking)])
+      fi
+    ]
+  )
+fi
+AC_MSG_CHECKING(whether 16 bits software WinCE backend will be built)
+AC_MSG_RESULT($have_evas_software_16_wince)
+AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16_WINCE, test 
"x$have_evas_software_16_wince" = "xyes")
+
+
+#######################################
 ## Check if we should build the software_x11 engine
 want_evas_software_x11="auto";
 have_evas_software_x11="no";
@@ -861,7 +892,7 @@
 dnl Windows has no sigsetjmp function, nor equivalent.
 dnl So we disable the jpeg saver.
 case "$host_os" in
-   mingw|mingw32)
+   mingw*|cegcc*)
    have_jpeg_saver="no"
    ;;
 esac
@@ -1538,6 +1569,9 @@
 if test "x$have_evas_software_16_ddraw" = "xyes"; then
    have_evas_software_16="yes"
 fi
+if test "x$have_evas_software_16_wince" = "xyes"; then
+   have_evas_software_16="yes"
+fi
 AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_16, test "x$have_evas_software_16" = 
"xyes")
 
 #####################################################################
@@ -1596,6 +1630,7 @@
 evas-software-ddraw.pc
 evas-software-16-ddraw.pc
 evas-direct3d.pc
+evas-software-16-wince.pc
 evas-software-sdl.pc
 evas.pc
 src/Makefile
@@ -1619,6 +1654,7 @@
 src/modules/engines/software_generic/Makefile
 src/modules/engines/software_ddraw/Makefile
 src/modules/engines/direct3d/Makefile
+src/modules/engines/software_16_wince/Makefile
 src/modules/engines/software_x11/Makefile
 src/modules/engines/software_xcb/Makefile
 src/modules/engines/fb/Makefile
@@ -1691,6 +1727,7 @@
 echo "  Software 16bit ............: $have_evas_software_16"
 echo "  Software 16bit X11.........: $have_evas_software_16_x11"
 echo "  Software 16bit Directdraw..: $have_evas_software_16_ddraw"
+echo "  Software 16bit WinCE.......: $have_evas_software_16_wince"
 echo "  Software 16bit SDL.........: $have_evas_sdl (primitive: 
$sdl_primitive)"
 # FIXME: opengl engine needs to be fixed and tested lots for all drivers
 # FIXME: xrender engine to be written



-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to