From 4e51efd326c4d093a322da22b3788c502cf6cff5 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 16 Feb 2010 01:27:25 +0000 Subject: [PATCH] 1. if software-x11 not enabled.. still build... but..... 2. ecore-txt is a REQUIREMENT FOR ECORE-X! DONT DISABLE! SVN revision: 46199 --- legacy/ecore/configure.ac | 2 +- legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h | 2 +- legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index ea2440b3a4..d9ef58fd0a 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -97,7 +97,7 @@ want_glib="no" # core modules want_ecore_data="yes" -want_ecore_txt="no" +want_ecore_txt="yes" want_ecore_con="no" want_ecore_ipc="no" want_ecore_file="yes" diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h index f9a2e3f420..c4f55f49d6 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h @@ -192,7 +192,7 @@ struct _Ecore_Evas_Engine { Ecore_Evas_Engine_Func *func; -#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11 +#ifdef BUILD_ECORE_EVAS_X11 struct { Ecore_X_Window win_root; Eina_List *win_extra; diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c index b37b290d93..fe3abdc544 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c @@ -1811,6 +1811,7 @@ _ecore_evas_x_transparent_set(Ecore_Evas *ee, int transparent) if (!strcmp(ee->driver, "software_x11")) { +#ifdef BUILD_ECORE_EVAS_SOFTWARE_X11 Evas_Engine_Info_Software_X11 *einfo; einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas); @@ -1820,6 +1821,7 @@ _ecore_evas_x_transparent_set(Ecore_Evas *ee, int transparent) einfo->info.destination_alpha = transparent; evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo); evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); +#endif } } #endif /* BUILD_ECORE_EVAS_X11 */