From c963d75dfdeec11f82e79e727062fbf89afa2c04 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 22 Apr 2012 09:19:23 +1000
Subject: Update EFL to latest beta.

---
 libraries/evas/src/examples/Makefile.am  | 2 --
 libraries/evas/src/examples/Makefile.in  | 9 ++++-----
 libraries/evas/src/examples/evas-box.c   | 2 +-
 libraries/evas/src/examples/evas-hints.c | 3 +++
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libraries/evas/src/examples')

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 = \
 @FONTCONFIG_CFLAGS@ \
 @pthread_cflags@
 
-AM_CFLAGS = @WIN32_CFLAGS@
-
 examples_PROGRAMS =
 
 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@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -339,6 +341,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PIXMAN_CFLAGS = @PIXMAN_CFLAGS@
 PIXMAN_LIBS = @PIXMAN_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PNG_CFLAGS = @PNG_CFLAGS@
 PNG_LIBS = @PNG_LIBS@
 RANLIB = @RANLIB@
@@ -357,8 +361,6 @@ VERSION = @VERSION@
 VMAJ = @VMAJ@
 WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@
 WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@
-WIN32_CFLAGS = @WIN32_CFLAGS@
-WIN32_CPPFLAGS = @WIN32_CPPFLAGS@
 XCB_CFLAGS = @XCB_CFLAGS@
 XCB_GL_CFLAGS = @XCB_GL_CFLAGS@
 XCB_GL_LIBS = @XCB_GL_LIBS@
@@ -432,8 +434,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@
 evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@
 evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@
 evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@
-evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@
-evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@
 evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@
 evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@
 evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@
@@ -539,7 +539,6 @@ files_DATA = $(am__append_3) $(am__append_4)
 @BUILD_EXAMPLES_TRUE@	@pthread_cflags@ $(am__append_1) \
 @BUILD_EXAMPLES_TRUE@	@ECORE_EVAS_CFLAGS@ @EDJE_CFLAGS@ \
 @BUILD_EXAMPLES_TRUE@	$(am__empty)
-@BUILD_EXAMPLES_TRUE@AM_CFLAGS = @WIN32_CFLAGS@
 @BUILD_ENGINE_BUFFER_TRUE@@BUILD_EXAMPLES_TRUE@evas_buffer_simple_SOURCES = evas-buffer-simple.c
 @BUILD_ENGINE_BUFFER_TRUE@@BUILD_EXAMPLES_TRUE@evas_buffer_simple_LDADD = $(top_builddir)/src/lib/libevas.la
 @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 @@
  * one). See stdout/stderr for output.
  *
  * @verbatim
- * gcc -o evas-box evas-box.c `pkg-config --libs --cflags evas ecore ecore-evas`
+ * gcc -o evas-box evas-box.c `pkg-config --libs --cflags evas ecore ecore-evas eina`
  * @endverbatim
  */
 
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 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#else
+#define __UNUSED__
 #endif
 
 #include <Ecore.h>
@@ -27,6 +29,7 @@
 
 #define WIDTH  320
 #define HEIGHT 480
+#define PACKAGE_EXAMPLES_DIR "."
 
 static const char commands[] = \
   "commands are:\n"
-- 
cgit v1.1