Update EFL to latest beta.

2 files changed, 6 insertions, 11 deletions

diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.am b/libraries/evas/src/modules/loaders/generic/Makefile.am
index a9e522e..1f72bfc 100644
--- a/libraries/evas/src/modules/loaders/generic/Makefile.am
+++ b/libraries/evas/src/modules/loaders/generic/Makefile.am
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \
 @PIXMAN_CFLAGS@ \
 @evas_image_loader_generic_cflags@ \
 @EINA_CFLAGS@ \
-@EVIL_CFLAGS@ \
-@WIN32_CPPFLAGS@
-
-AM_CFLAGS = @WIN32_CFLAGS@
+@EVIL_CFLAGS@
 
 
 if BUILD_LOADER_GENERIC
diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.in b/libraries/evas/src/modules/loaders/generic/Makefile.in
index dfd5294..98bb45b 100644
--- a/libraries/evas/src/modules/loaders/generic/Makefile.in
+++ b/libraries/evas/src/modules/loaders/generic/Makefile.in
@@ -182,6 +182,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@
@@ -232,6 +234,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@
@@ -250,8 +254,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@
@@ -325,8 +327,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@
@@ -418,10 +418,8 @@ AM_CPPFLAGS = \
 @PIXMAN_CFLAGS@ \
 @evas_image_loader_generic_cflags@ \
 @EINA_CFLAGS@ \
-@EVIL_CFLAGS@ \
-@WIN32_CPPFLAGS@
+@EVIL_CFLAGS@
 
-AM_CFLAGS = @WIN32_CFLAGS@
 @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
 @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la
 @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c