Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Ecore_Evas.h.in Makefile.am ecore_evas_x.c
Log Message:
don't build the ecore_x dependant parts if we didn't built ecore_x at all
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Ecore_Evas.h.in 27 Aug 2004 09:37:14 -0000 1.3
+++ Ecore_Evas.h.in 27 Aug 2004 10:02:45 -0000 1.4
@@ -24,6 +24,7 @@
extern "C" {
#endif
+#define HAVE_ECORE_EVAS_X @BUILD_ECORE_X@
#define HAVE_ECORE_EVAS_FB @BUILD_ECORE_EVAS_FB@
#define HAVE_ECORE_EVAS_GL @BUILD_ECORE_EVAS_GL@
@@ -42,6 +43,7 @@
int ecore_evas_shutdown(void);
/* engine/target specific init calls */
+#if HAVE_ECORE_EVAS_X
Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window
parent, int x, int y, int w, int h);
Ecore_X_Window ecore_evas_software_x11_window_get(Ecore_Evas *ee);
@@ -49,6 +51,7 @@
Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h);
Ecore_X_Window ecore_evas_gl_x11_window_get(Ecore_Evas *ee);
#endif
+#endif
#if HAVE_ECORE_EVAS_FB
Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 23 Jul 2004 04:57:03 -0000 1.4
+++ Makefile.am 27 Aug 2004 10:02:45 -0000 1.5
@@ -42,10 +42,13 @@
libecore_evas_la_SOURCES = \
ecore_evas.c \
-ecore_evas_x.c \
ecore_evas_fb.c \
ecore_evas_private.h
+if BUILD_ECORE_X
+libecore_evas_la_SOURCES += ecore_evas_x.c
+endif
+
libecore_evas_la_LIBADD = \
$(ECORE_X_LIB) \
$(ECORE_FB_LIB) \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_evas_x.c 27 Aug 2004 09:37:14 -0000 1.22
+++ ecore_evas_x.c 27 Aug 2004 10:02:45 -0000 1.23
@@ -3,11 +3,8 @@
#include "ecore_private.h"
#include "ecore_evas_private.h"
#include "Ecore_Evas.h"
-#ifdef BUILD_ECORE_X
#include "Ecore_X.h"
-#endif
-#ifdef BUILD_ECORE_X
static int _ecore_evas_init_count = 0;
static int _ecore_evas_fps_debug = 0;
@@ -1117,7 +1114,6 @@
_ecore_evas_withdrawn_set,
_ecore_evas_sticky_set
};
-#endif
/**
* To be documented.
@@ -1128,7 +1124,6 @@
ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h)
{
-#ifdef BUILD_ECORE_X
Evas_Engine_Info_Software_X11 *einfo;
Ecore_Evas *ee;
int rmethod;
@@ -1192,16 +1187,24 @@
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
return ee;
-#else
- return NULL;
-#endif
}
+/**
+ * To be documented.
+ *
+ * FIXME: To be fixed.
+ */
+Ecore_X_Window
+ecore_evas_software_x11_window_get(Ecore_Evas *ee)
+{
+ return ee->engine.x.win_container;
+}
+
+#ifdef BUILD_ECORE_EVAS_GL
Ecore_Evas *
ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
int x, int y, int w, int h)
{
-#ifdef BUILD_ECORE_EVAS_GL
Evas_Engine_Info_GL_X11 *einfo;
Ecore_Evas *ee;
int rmethod;
@@ -1289,24 +1292,6 @@
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
return ee;
-#else
- return NULL;
-#endif
-}
-
-/**
- * To be documented.
- *
- * FIXME: To be fixed.
- */
-Ecore_X_Window
-ecore_evas_software_x11_window_get(Ecore_Evas *ee)
-{
-#ifdef BUILD_ECORE_X
- return ee->engine.x.win_container;
-#else
- return 0;
-#endif
}
/**
@@ -1317,9 +1302,6 @@
Ecore_X_Window
ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
{
-#ifdef BUILD_ECORE_X
return ee->engine.x.win_container;
-#else
- return 0;
-#endif
}
+#endif
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
