Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
Tag: SPLIT
Makefile.am ecore_test.c
Log Message:
busy bee. some work from the weekend & recently committed... :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/Attic/Makefile.am,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -3 -r1.1.2.7 -r1.1.2.8
--- Makefile.am 9 Feb 2003 02:28:53 -0000 1.1.2.7
+++ Makefile.am 11 Feb 2003 06:27:09 -0000 1.1.2.8
@@ -1,10 +1,43 @@
## Process this file with automake to produce Makefile.in
+if BUILD_ECORE_EVAS
+ECORE_EVAS_INC = -I$(top_srcdir)/src/lib/ecore_evas
+ECORE_EVAS_LIB = $(top_builddir)/src/lib/ecore_evas/libecore_evas.la
+else
+ECORE_EVAS_INC =
+ECORE_EVAS_LIB =
+endif
+
+if BUILD_ECORE_X
+ECORE_X_INC = -I$(top_srcdir)/src/lib/ecore_x
+ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la
+else
+ECORE_X_INC =
+ECORE_X_LIB =
+endif
+
+if BUILD_ECORE_FB
+ECORE_FB_INC = -I$(top_srcdir)/src/lib/ecore_fb
+ECORE_FB_LIB = $(top_builddir)/src/lib/ecore_fb/libecore_fb.la
+else
+ECORE_FB_INC =
+ECORE_FB_LIB =
+endif
+
+if BUILD_ECORE_JOB
+ECORE_JOB_INC = -I$(top_srcdir)/src/lib/ecore_job
+ECORE_JOB_LIB = $(top_builddir)/src/lib/ecore_job/libecore_job.la
+else
+ECORE_JOB_INC =
+ECORE_JOB_LIB =
+endif
+
INCLUDES = \
-I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_job \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_evas \
+$(ECORE_JOB_INC) \
+$(ECORE_FB_INC) \
+$(ECORE_X_INC) \
+$(ECORE_EVAS_INC) \
@evas_cflags@ \
@x_cflags@
@@ -16,9 +49,10 @@
ecore_test_LDADD = $(LDFLAGS) \
$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_job/libecore_job.la \
-$(top_builddir)/src/lib/ecore_x/libecore_x.la \
-$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
+$(ECORE_JOB_LIB) \
+$(ECORE_FB_LIB) \
+$(ECORE_X_LIB) \
+$(ECORE_EVAS_LIB) \
-lm
ecore_test_LDFLAGS = \
@@ -31,6 +65,7 @@
ecore_test_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_job/libecore_job.la \
-$(top_builddir)/src/lib/ecore_x/libecore_x.la \
-$(top_builddir)/src/lib/ecore_evas/libecore_evas.la
+$(ECORE_JOB_LIB) \
+$(ECORE_FB_LIB) \
+$(ECORE_X_LIB) \
+$(ECORE_EVAS_LIB)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/Attic/ecore_test.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -3 -r1.1.2.19 -r1.1.2.20
--- ecore_test.c 9 Feb 2003 00:41:46 -0000 1.1.2.19
+++ ecore_test.c 11 Feb 2003 06:27:09 -0000 1.1.2.20
@@ -1,7 +1,17 @@
+#include "config.h"
#include "Ecore.h"
+#ifdef BUILD_ECORE_JOB
#include "Ecore_Job.h"
+#endif
+#ifdef BUILD_ECORE_X
#include "Ecore_X.h"
+#endif
+#ifdef BUILD_ECORE_FB
+#include "Ecore_Fb.h"
+#endif
+#ifdef BUILD_ECORE_EVAS
#include "Ecore_Evas.h"
+#endif
#include <math.h>
@@ -23,11 +33,13 @@
/**** ECORE TEST CODE */
/* NB: also tests ECORE_JOB */
+#ifdef BUILD_ECORE_JOB
void
job_call(void *data)
{
printf("!! Job done \"%s\"!\n", (char *)data);
}
+#endif
int
idle_enterer(void *data)
@@ -48,9 +60,11 @@
{
printf("Q- Timer tick %3.8f\n", ecore_time_get() - start_time);
/* test ecore_job */
+#ifdef BUILD_ECORE_JOB
ecore_job_add(job_call, "1");
ecore_job_add(job_call, "2");
ecore_job_add(job_call, "3");
+#endif
return 1;
}
@@ -62,6 +76,7 @@
ecore_timer_add(1.0, timer, NULL);
}
+#ifdef BUILD_ECORE_X
/**** ECORE_X TEST CODE */
Window win = 0;
@@ -250,7 +265,9 @@
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROP_TITLE_CHANGE,
handler_x_window_prop_title_change, NULL);
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROP_NAME_CLASS_CHANGE,
handler_x_window_prop_name_class_change, NULL);
}
+#endif
+#ifdef BUILD_ECORE_EVAS
/**** ECORE_EVAS TEST CODE */
Ecore_Timer *anim_timer = NULL;
@@ -342,7 +359,7 @@
else
ecore_evas_shaped_set(ee, 0);
}
-#if 0 /* no data files shipped yet to test this */
+#if 1 /* no data files shipped yet to test this */
if (!strcmp(ev->keyname, "p"))
{
char *fl;
@@ -364,6 +381,7 @@
/* create a new ecore wrapped evas canvas in X */
ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
+/* ee = ecore_evas_fb_new(NULL, 0, 240, 320); */
ecore_evas_title_set(ee, "Ecore Evas Test");
ecore_evas_name_class_set(ee, "ecore_test", "test_evas");
/* callback if clsoe button is pressed and win is asked to be deleted */
@@ -409,6 +427,7 @@
ecore_evas_show(ee);
}
+#endif
/**** MAIN */
int
@@ -422,11 +441,19 @@
/* tell ecore what our arguments are */
ecore_app_args_set(argc, argv);
+#ifdef BUILD_ECORE_X
/* init ecore_x */
if (!ecore_x_init(NULL)) return -1;
+#endif
+#ifdef BUILD_ECORE_FB
+ /* init ecore_fb */
+/* if (!ecore_fb_init(NULL)) return -1; */
+#endif
+#ifdef BUILD_ECORE_EVAS
/* init ecore_evas */
if (!ecore_evas_init()) return -1;
-
+#endif
+
/* setup a callback to handle a systsme signal to quit */
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, handler_signal_exit, NULL);
@@ -435,12 +462,12 @@
setup_ecore_test();
#endif
-#if 0
+#ifdef BUILD_ECORE_X
/* setup to test ecore_x module things */
- setup_ecore_x_test();
+/* setup_ecore_x_test(); */
#endif
-#if 1
+#ifdef BUILD_ECORE_EVAS
/* setup to test ecore_evas module */
setup_ecore_evas_test();
#endif
@@ -448,10 +475,20 @@
/* run the main loop */
ecore_main_loop_begin();
+ /* free our canvas */
+ ecore_evas_free(ee);
+#ifdef BUILD_ECORE_EVAS
/* shut down ecore_evas */
ecore_evas_shutdown();
+#endif
+#ifdef BUILD_ECORE_FB
+ /* shut down ecore_fb */
+/* ecore_fb_shutdown(); */
+#endif
+#ifdef BUILD_ECORE_X
/* shut down ecore_x */
ecore_x_shutdown();
+#endif
/* shut down ecore */
ecore_shutdown();
return 0;
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
