From 426a67340f294e7f6ca53b959f60ef531e3e79fb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 10 Jul 2003 13:34:04 +0000 Subject: [PATCH] build cross-compiled version. edje on ipaq's :) SVN revision: 7126 --- legacy/edje/Makefile.am | 3 +- legacy/edje/make_cross_compile_arm.sh | 72 +++++++++++++++++++++++++++ legacy/edje/src/bin/edje.h | 4 ++ legacy/edje/src/bin/edje_main.c | 23 ++------- legacy/edje/src/lib/Edje.h | 7 ++- legacy/edje/src/lib/edje_callbacks.c | 2 + legacy/edje/src/lib/edje_private.h | 8 ++- 7 files changed, 98 insertions(+), 21 deletions(-) create mode 100755 legacy/edje/make_cross_compile_arm.sh diff --git a/legacy/edje/Makefile.am b/legacy/edje/Makefile.am index e223175542..4f881175aa 100644 --- a/legacy/edje/Makefile.am +++ b/legacy/edje/Makefile.am @@ -32,5 +32,6 @@ dist-hook: bin_SCRIPTS = edje-config -EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN edje.spec edje.c.in gendoc Doxyfile edje_docs.tar.gz +EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN edje.spec edje.c.in gendoc Doxyfile edje_docs.tar.gz \ +make_cross_compile_arm.sh diff --git a/legacy/edje/make_cross_compile_arm.sh b/legacy/edje/make_cross_compile_arm.sh new file mode 100755 index 0000000000..fdda6bf8cb --- /dev/null +++ b/legacy/edje/make_cross_compile_arm.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +make clean distclean +./configure + +CC="/skiff/local/bin/arm-linux-gcc" +ST="/skiff/local/bin/arm-linux-strip" +CFLAGS="-O2" + +rm -rf "build" +mkdir "build" +DST=`pwd`"/build"; + +mkdir $DST"/lib"; +mkdir $DST"/bin"; +mkdir $DST"/include"; +mkdir $DST"/share"; +mkdir $DST"/share/edje"; + +pushd src + + pushd lib + LIB="edje" + $CC \ + *.c \ + -DEDJE_FB_ONLY \ + $CFLAGS \ + -I. \ + -I../.. \ + -I/skiff/local/include \ + -shared -fPIC -DPIC \ + -Wl,-soname -Wl,"lib"$LIB".so.0" \ + -o "lib"$LIB".so.0.0.1" + $ST -g "lib"$LIB".so.0.0.1" + rm -f "lib"$LIB".so" + ln -s "lib"$LIB".so.0.0.1" "lib"$LIB".so" + rm -f "lib"$LIB".so.0" + ln -s "lib"$LIB".so.0.0.1" "lib"$LIB".so.0" + rm -f "lib"$LIB".so.0.0" + ln -s "lib"$LIB".so.0.0.1" "lib"$LIB".so.0.0" + cp -a "lib"$LIB".so"* $DST"/lib"; + cp -a Edje.h $DST"/include"; + popd + + pushd bin + BIN="edje" + $CC edje_main.c \ + -DEDJE_FB_ONLY \ + -I../.. -I../lib \ + -I. \ + -I/skiff/local/include \ + -L. -L../lib \ + -L/skiff/local/lib \ + -ledje \ + -lecore -lecore_evas -lecore_fb -lecore_ipc -lecore_con -lecore_job \ + -levas -leet -ljpeg -lpng -lfreetype -lm -lz \ + -o $BIN + $ST $BIN + cp -a $BIN $DST"/bin"; + popd +popd + +mkdir $DST"/share/edje/data" +cp -ar data/test data/e_logo.eet $DST"/share/edje/data" + +PD=`pwd` +pushd "build" + tar zcvf $PD"/data.tar.gz" * + pushd "/skiff/local" + sudo tar zxvf $PD"/data.tar.gz" + popd +popd diff --git a/legacy/edje/src/bin/edje.h b/legacy/edje/src/bin/edje.h index ddc6323273..a1ed6d0dc8 100644 --- a/legacy/edje/src/bin/edje.h +++ b/legacy/edje/src/bin/edje.h @@ -3,7 +3,11 @@ #include #include +#ifndef EDJE_FB_ONLY #include +#else +#include +#endif #include /* ... only for testing */ #include diff --git a/legacy/edje/src/bin/edje_main.c b/legacy/edje/src/bin/edje_main.c index 31930ae9c7..4057e38e5c 100644 --- a/legacy/edje/src/bin/edje_main.c +++ b/legacy/edje/src/bin/edje_main.c @@ -46,24 +46,11 @@ main_start(int argc, char **argv) ecore_app_args_set(argc, (const char **)argv); ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL); if (!ecore_evas_init()) return -1; -#if 0 - if ((argc > 1) && (!strcmp(argv[1], "-fb"))) - ecore_evas = ecore_evas_fb_new(NULL, 0, 240, 320); - else if ((argc > 1) && (!strcmp(argv[1], "-x"))) - ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320); - else if ((argc > 1) && (!strcmp(argv[1], "-h"))) - { - printf("%s -x Run in X (default)\n" - "%s -fb Run in the Framebuffer\n" - "%s -h Display this help\n", - argv[0], argv[0], argv[0]); - ecore_evas_shutdown(); - ecore_shutdown(); - return 0; - } - else -#endif - ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320); +#ifndef EDJE_FB_ONLY + ecore_evas = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320); +#else + ecore_evas = ecore_evas_fb_new(NULL, 0, 240, 320); +#endif if (!ecore_evas) return -1; ecore_evas_callback_delete_request_set(ecore_evas, main_delete_request); ecore_evas_callback_resize_set(ecore_evas, main_resize); diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h index 13189e3060..1733d0355f 100644 --- a/legacy/edje/src/lib/Edje.h +++ b/legacy/edje/src/lib/Edje.h @@ -25,7 +25,12 @@ extern "C" { void edje_object_part_geometry_get (Evas_Object *o, const char *part, double *x, double *y, double *w, double *h); void edje_object_part_text_set (Evas_Object *o, const char *part, const char *text); const char *edje_object_part_text_get (Evas_Object *o, const char *part); - + +#if 0 + void edje_object_color_class_set (Evas_Object *o, const char *color_class, int r, int g, int b, int a); + void edje_object_text_class_set (Evas_Object *o, const char *text_class, const char *font, double size); +#endif + #ifdef __cplusplus } #endif diff --git a/legacy/edje/src/lib/edje_callbacks.c b/legacy/edje/src/lib/edje_callbacks.c index 740ccad4d8..fb5c2fc296 100644 --- a/legacy/edje/src/lib/edje_callbacks.c +++ b/legacy/edje/src/lib/edje_callbacks.c @@ -41,6 +41,7 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) ed = data; rp = evas_object_data_get(obj, "real_part"); if (!rp) return; +#ifndef EDJE_FB_ONLY if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN) { Ecore_X_Event_Mouse_Button_Down *evx; @@ -59,6 +60,7 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info) snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button); } else +#endif snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button); if (rp->clicked_button == 0) { diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h index 41664af964..0e3f81dbff 100644 --- a/legacy/edje/src/lib/edje_private.h +++ b/legacy/edje/src/lib/edje_private.h @@ -5,7 +5,11 @@ #include #include +#ifndef EDJE_FB_ONLY #include +#else +#include +#endif #include #include @@ -33,8 +37,10 @@ * * externally sourced images need to be supported in edje_cc and edje * - * need to detect relative part loops + * need to detect rel1_to part loops + * need to detect rel2_to part loops * need to detect clip_to part loops + * need to detect confine_to part loops * * edje_cc should be able to force lossy, lossless, min and max quality and compression of encoded images * edje_cc needs to prune out unused images