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/evas/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 '')
-rw-r--r-- | libraries/evas/src/examples/Makefile.am | 2 | ||||
-rw-r--r-- | libraries/evas/src/examples/Makefile.in | 9 | ||||
-rw-r--r-- | libraries/evas/src/examples/evas-box.c | 2 | ||||
-rw-r--r-- | libraries/evas/src/examples/evas-hints.c | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libraries/evas/src/examples/Makefile.am b/libraries/evas/src/examples/Makefile.am index ffa9274..a52e3f8 100644 --- a/libraries/evas/src/examples/Makefile.am +++ b/libraries/evas/src/examples/Makefile.am | |||
@@ -26,8 +26,6 @@ AM_CPPFLAGS = \ | |||
26 | @FONTCONFIG_CFLAGS@ \ | 26 | @FONTCONFIG_CFLAGS@ \ |
27 | @pthread_cflags@ | 27 | @pthread_cflags@ |
28 | 28 | ||
29 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
30 | |||
31 | examples_PROGRAMS = | 29 | examples_PROGRAMS = |
32 | 30 | ||
33 | if BUILD_ENGINE_BUFFER | 31 | if BUILD_ENGINE_BUFFER |
diff --git a/libraries/evas/src/examples/Makefile.in b/libraries/evas/src/examples/Makefile.in index f58d297..1cc1108 100644 --- a/libraries/evas/src/examples/Makefile.in +++ b/libraries/evas/src/examples/Makefile.in | |||
@@ -289,6 +289,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
289 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 289 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
290 | EVIL_LIBS = @EVIL_LIBS@ | 290 | EVIL_LIBS = @EVIL_LIBS@ |
291 | EXEEXT = @EXEEXT@ | 291 | EXEEXT = @EXEEXT@ |
292 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
293 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
292 | FGREP = @FGREP@ | 294 | FGREP = @FGREP@ |
293 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 295 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
294 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 296 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -339,6 +341,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
339 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 341 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
340 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 342 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
341 | PKG_CONFIG = @PKG_CONFIG@ | 343 | PKG_CONFIG = @PKG_CONFIG@ |
344 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
345 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
342 | PNG_CFLAGS = @PNG_CFLAGS@ | 346 | PNG_CFLAGS = @PNG_CFLAGS@ |
343 | PNG_LIBS = @PNG_LIBS@ | 347 | PNG_LIBS = @PNG_LIBS@ |
344 | RANLIB = @RANLIB@ | 348 | RANLIB = @RANLIB@ |
@@ -357,8 +361,6 @@ VERSION = @VERSION@ | |||
357 | VMAJ = @VMAJ@ | 361 | VMAJ = @VMAJ@ |
358 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 362 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
359 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 363 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
360 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
361 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
362 | XCB_CFLAGS = @XCB_CFLAGS@ | 364 | XCB_CFLAGS = @XCB_CFLAGS@ |
363 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 365 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
364 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 366 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -432,8 +434,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
432 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 434 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
433 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 435 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
434 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 436 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
435 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
436 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
437 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 437 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
438 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 438 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
439 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 439 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -539,7 +539,6 @@ files_DATA = $(am__append_3) $(am__append_4) | |||
539 | @BUILD_EXAMPLES_TRUE@ @pthread_cflags@ $(am__append_1) \ | 539 | @BUILD_EXAMPLES_TRUE@ @pthread_cflags@ $(am__append_1) \ |
540 | @BUILD_EXAMPLES_TRUE@ @ECORE_EVAS_CFLAGS@ @EDJE_CFLAGS@ \ | 540 | @BUILD_EXAMPLES_TRUE@ @ECORE_EVAS_CFLAGS@ @EDJE_CFLAGS@ \ |
541 | @BUILD_EXAMPLES_TRUE@ $(am__empty) | 541 | @BUILD_EXAMPLES_TRUE@ $(am__empty) |
542 | @BUILD_EXAMPLES_TRUE@AM_CFLAGS = @WIN32_CFLAGS@ | ||
543 | @BUILD_ENGINE_BUFFER_TRUE@@BUILD_EXAMPLES_TRUE@evas_buffer_simple_SOURCES = evas-buffer-simple.c | 542 | @BUILD_ENGINE_BUFFER_TRUE@@BUILD_EXAMPLES_TRUE@evas_buffer_simple_SOURCES = evas-buffer-simple.c |
544 | @BUILD_ENGINE_BUFFER_TRUE@@BUILD_EXAMPLES_TRUE@evas_buffer_simple_LDADD = $(top_builddir)/src/lib/libevas.la | 543 | @BUILD_ENGINE_BUFFER_TRUE@@BUILD_EXAMPLES_TRUE@evas_buffer_simple_LDADD = $(top_builddir)/src/lib/libevas.la |
545 | @BUILD_EXAMPLES_TRUE@evas_init_shutdown_SOURCES = evas-init-shutdown.c | 544 | @BUILD_EXAMPLES_TRUE@evas_init_shutdown_SOURCES = evas-init-shutdown.c |
diff --git a/libraries/evas/src/examples/evas-box.c b/libraries/evas/src/examples/evas-box.c index 13f12cf..ec79535 100644 --- a/libraries/evas/src/examples/evas-box.c +++ b/libraries/evas/src/examples/evas-box.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * one). See stdout/stderr for output. | 5 | * one). See stdout/stderr for output. |
6 | * | 6 | * |
7 | * @verbatim | 7 | * @verbatim |
8 | * gcc -o evas-box evas-box.c `pkg-config --libs --cflags evas ecore ecore-evas` | 8 | * gcc -o evas-box evas-box.c `pkg-config --libs --cflags evas ecore ecore-evas eina` |
9 | * @endverbatim | 9 | * @endverbatim |
10 | */ | 10 | */ |
11 | 11 | ||
diff --git a/libraries/evas/src/examples/evas-hints.c b/libraries/evas/src/examples/evas-hints.c index c42444c..78c09ba 100644 --- a/libraries/evas/src/examples/evas-hints.c +++ b/libraries/evas/src/examples/evas-hints.c | |||
@@ -16,6 +16,8 @@ | |||
16 | 16 | ||
17 | #ifdef HAVE_CONFIG_H | 17 | #ifdef HAVE_CONFIG_H |
18 | #include "config.h" | 18 | #include "config.h" |
19 | #else | ||
20 | #define __UNUSED__ | ||
19 | #endif | 21 | #endif |
20 | 22 | ||
21 | #include <Ecore.h> | 23 | #include <Ecore.h> |
@@ -27,6 +29,7 @@ | |||
27 | 29 | ||
28 | #define WIDTH 320 | 30 | #define WIDTH 320 |
29 | #define HEIGHT 480 | 31 | #define HEIGHT 480 |
32 | #define PACKAGE_EXAMPLES_DIR "." | ||
30 | 33 | ||
31 | static const char commands[] = \ | 34 | static const char commands[] = \ |
32 | "commands are:\n" | 35 | "commands are:\n" |