backend: remove Windows CE support Windows CE is dead and buried and its gcc port is even more dead and I don't believe in zombies

2014-06-11 08:44:03 +02:00 · 2014-06-11 08:44:03 +02:00 · 0d6cacb743
parent f0c2f96f20
commit 0d6cacb743
19 changed files with 12 additions and 81 deletions
--- a/legacy/elementary/configure.ac
+++ b/legacy/elementary/configure.ac
@ -35,22 +35,9 @@ AC_SUBST(DEPS_EOLIAN_FLAGS)

 ELM_UNIX_DEF="#undef"
 ELM_WIN32_DEF="#undef"
-ELM_WINCE_DEF="#undef"
 have_windows="no"
 have_dlopen="no"
 case "$host_os" in
-   mingw32ce*)
-      PKG_CHECK_MODULES([EVIL], [evil])
-      AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
-      ELM_WINCE_DEF="#define"
-      have_windows="yes"
-dnl managed by evil
-      AC_DEFINE(HAVE_DLADDR)
-      have_dlopen="yes"
-      dlopen_libs=-ldl
-      requirement_elm="evil"
-      have_socket="no"
-    ;;
   mingw*)
      PKG_CHECK_MODULES([EVIL], [evil])
      AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
@ -127,14 +114,7 @@ ELM_VERSION_MINOR="v_min"
 AC_SUBST(ELM_VERSION_MAJOR)
 AC_SUBST(ELM_VERSION_MINOR)

-case "$host_os" in
-  mingw32ce* | cegcc*)
-    MODULE_ARCH="v"
-    ;;
-  *)
-    MODULE_ARCH="v-v_maj.v_min.v_mic"
-    ;;
-esac
+MODULE_ARCH="v-v_maj.v_min.v_mic"
 AC_SUBST(MODULE_ARCH)
 AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")

@ -188,7 +168,6 @@ getuid \
 AC_SUBST(dlopen_libs)
 AC_SUBST(ELM_UNIX_DEF)
 AC_SUBST(ELM_WIN32_DEF)
-AC_SUBST(ELM_WINCE_DEF)

 AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"])

@ -378,29 +357,6 @@ if test "x$want_elementary_win32" = "xyes" -a "x$have_elementary_win32" = "xno";
    AC_MSG_ERROR([ecore-win32 support requested, but ecore-win32 was not found by pkg-config.])
 fi

-have_elementary_wince="no"
-want_elementary_wince="auto"
-AC_ARG_ENABLE([ecore-wince],
-   [AC_HELP_STRING([--disable-ecore-wince], [disable ecore-wince support. @<:@default=detect@:>@])],
-   [want_elementary_wince=$enableval], [])
-
-if test "x$want_elementary_wince" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_WINCE],
-      [ecore-wince >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary])
-       have_elementary_wince="yes"
-       requirement_elm="ecore-wince >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_wince="no"]
-   )
-else
-    have_elementary_wince="no"
-fi
-if test "x$want_elementary_wince" = "xyes" -a "x$have_elementary_wince" = "xno"; then
-    AC_MSG_ERROR([ecore-wince support requested, but ecore-wince was not found by pkg-config.])
-fi
-
 have_elementary_wayland="no"
 want_elementary_wayland="auto"
 AC_ARG_ENABLE([ecore-wayland],
@ -754,7 +710,6 @@ echo "    PSL1GHT................: ${have_elementary_psl1ght}"
 echo "    SDL....................: ${have_elementary_sdl}"
 echo "    Cocoa..................: ${have_elementary_cocoa}"
 echo "    Windows XP.............: ${have_elementary_win32}"
-echo "    Windows CE.............: ${have_elementary_wince}"
 echo "    Wayland................: ${have_elementary_wayland}"
 echo
 echo "  Features:"
--- a/legacy/elementary/doc/widgets/Makefile.am
+++ b/legacy/elementary/doc/widgets/Makefile.am
@ -16,7 +16,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_X_CFLAGS@ \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/bin/Makefile.am
+++ b/legacy/elementary/src/bin/Makefile.am
@ -15,7 +15,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/bin/config.c
+++ b/legacy/elementary/src/bin/config.c
@ -3407,7 +3407,6 @@ _elm_engine_supported(const char *engine)
      "xrender_x11",
      "opengl_x11",
      "software_gdi",
-      "software_16_wince_gdi",
      "sdl",
      "software_16_sdl",
      "opengl_sdl",
--- a/legacy/elementary/src/edje_externals/Makefile.am
+++ b/legacy/elementary/src/edje_externals/Makefile.am
@ -13,7 +13,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_X_CFLAGS@ \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EMAP_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@ -13,7 +13,6 @@

@ELM_UNIX_DEF@ ELM_UNIX
@ELM_WIN32_DEF@ ELM_WIN32
-@ELM_WINCE_DEF@ ELM_WINCE
@ELM_ELOCATION_DEF@ ELM_ELOCATION
@ELM_WEB_DEF@ ELM_WEB
@ELM_WEB2_DEF@ ELM_WEB2
@ -57,7 +56,7 @@
 #include <alloca.h>
 #endif

-#if defined (ELM_WIN32) || defined (ELM_WINCE)
+#ifdef ELM_WIN32
 #include <malloc.h>
 #ifndef alloca
 #define alloca _alloca
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@ -26,7 +26,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
@ -520,7 +519,6 @@ libelementary_la_LIBADD = \
@ELEMENTARY_FB_LIBS@ \
@ELEMENTARY_SDL_LIBS@ \
@ELEMENTARY_WIN32_LIBS@ \
-@ELEMENTARY_WINCE_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \
@ELEMENTARY_WEB_LIBS@ \
@ELEMENTARY_EMAP_LIBS@ \
--- a/legacy/elementary/src/lib/elm_config.c
+++ b/legacy/elementary/src/lib/elm_config.c
@ -41,7 +41,6 @@ const char *_elm_engines[] = {
   "xrender_x11",
   "opengl_x11",
   "software_gdi",
-   "software_16_wince_gdi",
   "sdl",
   "software_16_sdl",
   "opengl_sdl",
--- a/legacy/elementary/src/lib/elm_config.h
+++ b/legacy/elementary/src/lib/elm_config.h
@ -786,7 +786,6 @@ EAPI void      elm_config_password_show_last_timeout_set(double password_show_la
 * @li "xrender_x11"
 * @li "opengl_x11"
 * @li "software_gdi"
- * @li "software_16_wince_gdi"
 * @li "sdl"
 * @li "software_16_sdl"
 * @li "opengl_sdl"
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@ -708,7 +708,6 @@ elm_quicklaunch_sub_shutdown(void)
            ENGINE_COMPARE(ELM_OPENGL_SDL) ||
            ENGINE_COMPARE(ELM_OPENGL_COCOA) ||
            ENGINE_COMPARE(ELM_SOFTWARE_WIN32) ||
-            ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE) ||
            ENGINE_COMPARE(ELM_EWS))
 #undef ENGINE_COMPARE
          evas_cserve_disconnect();
--- a/legacy/elementary/src/lib/elm_priv.h
+++ b/legacy/elementary/src/lib/elm_priv.h
@ -6,9 +6,6 @@
 #ifdef HAVE_ELEMENTARY_FB
 #include <Ecore_Fb.h>
 #endif
-#ifdef HAVE_ELEMENTARY_WINCE
-#include <Ecore_WinCE.h>
-#endif
 #ifdef HAVE_ELEMENTARY_WAYLAND
 #include <Ecore_Wayland.h>
 #endif
@ -145,17 +142,16 @@ extern const char *_elm_engines[];
 #define ELM_XRENDER_X11       (_elm_engines[5])
 #define ELM_OPENGL_X11        (_elm_engines[6])
 #define ELM_SOFTWARE_WIN32    (_elm_engines[7])
-#define ELM_SOFTWARE_16_WINCE (_elm_engines[8])
-#define ELM_SOFTWARE_SDL      (_elm_engines[9])
-#define ELM_SOFTWARE_16_SDL   (_elm_engines[10])
-#define ELM_OPENGL_SDL        (_elm_engines[11])
-#define ELM_BUFFER            (_elm_engines[12])
-#define ELM_EWS               (_elm_engines[13])
-#define ELM_OPENGL_COCOA      (_elm_engines[14])
-#define ELM_SOFTWARE_PSL1GHT  (_elm_engines[15])
-#define ELM_WAYLAND_SHM       (_elm_engines[16])
-#define ELM_WAYLAND_EGL       (_elm_engines[17])
-#define ELM_DRM               (_elm_engines[18])
+#define ELM_SOFTWARE_SDL      (_elm_engines[8])
+#define ELM_SOFTWARE_16_SDL   (_elm_engines[9])
+#define ELM_OPENGL_SDL        (_elm_engines[10])
+#define ELM_BUFFER            (_elm_engines[11])
+#define ELM_EWS               (_elm_engines[12])
+#define ELM_OPENGL_COCOA      (_elm_engines[13])
+#define ELM_SOFTWARE_PSL1GHT  (_elm_engines[14])
+#define ELM_WAYLAND_SHM       (_elm_engines[15])
+#define ELM_WAYLAND_EGL       (_elm_engines[16])
+#define ELM_DRM               (_elm_engines[17])

 #define ELM_FONT_TOKEN_STYLE  ":style="

--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@ -3638,7 +3638,6 @@ _elm_win_fullscreen_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool fullscr
 {
   // YYY: handle if sd->img_obj
   if (ENGINE_COMPARE(ELM_SOFTWARE_FB) ||
-       ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE) || 
       ENGINE_COMPARE(ELM_DRM))
     {
        // these engines... can ONLY be fullscreen
@ -3686,7 +3685,6 @@ _elm_win_fullscreen_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)

   if (engine_name &&
       ((!strcmp(engine_name, ELM_SOFTWARE_FB)) ||
-        (!strcmp(engine_name, ELM_SOFTWARE_16_WINCE)) || 
        (!strcmp(engine_name, ELM_DRM))))
     {
        // these engines... can ONLY be fullscreen
--- a/legacy/elementary/src/lib/elm_win.h
+++ b/legacy/elementary/src/lib/elm_win.h
@ -35,8 +35,6 @@
 * grayscale using dedicated 8bit software engine in X11)
 * @li "x11-16", "x16", "software-16-x11", "software_16_x11" (Rendering in
 * X11 using 16bit software engine)
- * @li "wince-gdi", "software-16-wince-gdi", "software_16_wince_gdi"
- * (Windows CE rendering via GDI with 16bit software renderer)
 * @li "sdl-16", "software-16-sdl", "software_16_sdl" (Rendering to SDL
 * buffer with 16bit software renderer)
 * @li "ews" (rendering to EWS - Ecore + Evas Single Process Windowing System)
--- a/legacy/elementary/src/modules/access_output/Makefile.am
+++ b/legacy/elementary/src/modules/access_output/Makefile.am
@ -14,7 +14,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
@ -15,7 +15,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/modules/prefs/Makefile.am
+++ b/legacy/elementary/src/modules/prefs/Makefile.am
@ -27,7 +27,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
@ELEMENTARY_EMAP_CFLAGS@ \
--- a/legacy/elementary/src/modules/test_entry/Makefile.am
+++ b/legacy/elementary/src/modules/test_entry/Makefile.am
@ -14,7 +14,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/modules/test_map/Makefile.am
+++ b/legacy/elementary/src/modules/test_map/Makefile.am
@ -14,7 +14,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
-@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ELEMENTARY_EWEATHER_CFLAGS@ \
@ELEMENTARY_WEB_CFLAGS@ \
--- a/legacy/elementary/src/tests/Makefile.am
+++ b/legacy/elementary/src/tests/Makefile.am
@ -81,7 +81,6 @@ elm_suite_CPPFLAGS = \
 	@ELEMENTARY_FB_CFLAGS@ \
 	@ELEMENTARY_SDL_CFLAGS@ \
 	@ELEMENTARY_WIN32_CFLAGS@ \
-	@ELEMENTARY_WINCE_CFLAGS@ \
 	@ELEMENTARY_ELOCATION_CFLAGS@ \
 	@ELEMENTARY_EWEATHER_CFLAGS@ \
 	@ELEMENTARY_WEB_CFLAGS@ \