diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/examples | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to 'libraries/ecore/src/examples')
-rw-r--r-- | libraries/ecore/src/examples/Makefile.in | 20 | ||||
-rw-r--r-- | libraries/ecore/src/examples/ecore_evas_basics_example.c | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/libraries/ecore/src/examples/Makefile.in b/libraries/ecore/src/examples/Makefile.in index 7fac88c..5b984ed 100644 --- a/libraries/ecore/src/examples/Makefile.in +++ b/libraries/ecore/src/examples/Makefile.in | |||
@@ -81,16 +81,15 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_attribute.m4 \ | |||
81 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ | 81 | $(top_srcdir)/m4/efl_path_max.m4 $(top_srcdir)/m4/efl_tests.m4 \ |
82 | $(top_srcdir)/m4/efl_threads.m4 $(top_srcdir)/m4/gettext.m4 \ | 82 | $(top_srcdir)/m4/efl_threads.m4 $(top_srcdir)/m4/gettext.m4 \ |
83 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ | 83 | $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
84 | $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ | 84 | $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
85 | $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ | 85 | $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ |
86 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 86 | $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
87 | $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ | 87 | $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
88 | $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ | 88 | $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ |
89 | $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ | 89 | $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
90 | $(top_srcdir)/configure.ac | ||
91 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 90 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
92 | $(ACLOCAL_M4) | 91 | $(ACLOCAL_M4) |
93 | mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | 92 | mkinstalldirs = $(install_sh) -d |
94 | CONFIG_HEADER = $(top_builddir)/config.h | 93 | CONFIG_HEADER = $(top_builddir)/config.h |
95 | CONFIG_CLEAN_FILES = | 94 | CONFIG_CLEAN_FILES = |
96 | CONFIG_CLEAN_VPATH_FILES = | 95 | CONFIG_CLEAN_VPATH_FILES = |
@@ -408,6 +407,8 @@ EVAS_LIBS = @EVAS_LIBS@ | |||
408 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 407 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
409 | EVIL_LIBS = @EVIL_LIBS@ | 408 | EVIL_LIBS = @EVIL_LIBS@ |
410 | EXEEXT = @EXEEXT@ | 409 | EXEEXT = @EXEEXT@ |
410 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
411 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
411 | FGREP = @FGREP@ | 412 | FGREP = @FGREP@ |
412 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ | 413 | GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
413 | GLIB_CFLAGS = @GLIB_CFLAGS@ | 414 | GLIB_CFLAGS = @GLIB_CFLAGS@ |
@@ -463,6 +464,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
463 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 464 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
464 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 465 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
465 | PKG_CONFIG = @PKG_CONFIG@ | 466 | PKG_CONFIG = @PKG_CONFIG@ |
467 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
468 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
466 | POSUB = @POSUB@ | 469 | POSUB = @POSUB@ |
467 | RANLIB = @RANLIB@ | 470 | RANLIB = @RANLIB@ |
468 | SCIM_CFLAGS = @SCIM_CFLAGS@ | 471 | SCIM_CFLAGS = @SCIM_CFLAGS@ |
@@ -473,6 +476,7 @@ SDL_LIBS = @SDL_LIBS@ | |||
473 | SED = @SED@ | 476 | SED = @SED@ |
474 | SET_MAKE = @SET_MAKE@ | 477 | SET_MAKE = @SET_MAKE@ |
475 | SHELL = @SHELL@ | 478 | SHELL = @SHELL@ |
479 | SHM_OPEN_LIBS = @SHM_OPEN_LIBS@ | ||
476 | SSL_CFLAGS = @SSL_CFLAGS@ | 480 | SSL_CFLAGS = @SSL_CFLAGS@ |
477 | SSL_LIBS = @SSL_LIBS@ | 481 | SSL_LIBS = @SSL_LIBS@ |
478 | STRIP = @STRIP@ | 482 | STRIP = @STRIP@ |
diff --git a/libraries/ecore/src/examples/ecore_evas_basics_example.c b/libraries/ecore/src/examples/ecore_evas_basics_example.c index 5f0231f..942f9c6 100644 --- a/libraries/ecore/src/examples/ecore_evas_basics_example.c +++ b/libraries/ecore/src/examples/ecore_evas_basics_example.c | |||
@@ -77,10 +77,7 @@ main(void) | |||
77 | evas_object_show(bg); | 77 | evas_object_show(bg); |
78 | ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE); | 78 | ecore_evas_object_associate(ee, bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE); |
79 | 79 | ||
80 | ecore_main_fd_handler_add(STDIN_FILENO, | 80 | ecore_main_fd_handler_add(STDIN_FILENO, ECORE_FD_READ, _stdin_cb, NULL, NULL, NULL); |
81 | ECORE_FD_READ | ECORE_FD_ERROR, | ||
82 | _stdin_cb, | ||
83 | NULL, NULL, NULL); | ||
84 | 81 | ||
85 | ecore_main_loop_begin(); | 82 | ecore_main_loop_begin(); |
86 | 83 | ||