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/modules/loaders/generic | |
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/evas/src/modules/loaders/generic')
-rw-r--r-- | libraries/evas/src/modules/loaders/generic/Makefile.am | 5 | ||||
-rw-r--r-- | libraries/evas/src/modules/loaders/generic/Makefile.in | 12 |
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 = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @evas_image_loader_generic_cflags@ \ | 10 | @evas_image_loader_generic_cflags@ \ |
11 | @EINA_CFLAGS@ \ | 11 | @EINA_CFLAGS@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | 14 | ||
18 | if BUILD_LOADER_GENERIC | 15 | 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@ | |||
182 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 182 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
183 | EVIL_LIBS = @EVIL_LIBS@ | 183 | EVIL_LIBS = @EVIL_LIBS@ |
184 | EXEEXT = @EXEEXT@ | 184 | EXEEXT = @EXEEXT@ |
185 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
186 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
185 | FGREP = @FGREP@ | 187 | FGREP = @FGREP@ |
186 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 188 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
187 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 189 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -232,6 +234,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
232 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 234 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
233 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 235 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
234 | PKG_CONFIG = @PKG_CONFIG@ | 236 | PKG_CONFIG = @PKG_CONFIG@ |
237 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
238 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
235 | PNG_CFLAGS = @PNG_CFLAGS@ | 239 | PNG_CFLAGS = @PNG_CFLAGS@ |
236 | PNG_LIBS = @PNG_LIBS@ | 240 | PNG_LIBS = @PNG_LIBS@ |
237 | RANLIB = @RANLIB@ | 241 | RANLIB = @RANLIB@ |
@@ -250,8 +254,6 @@ VERSION = @VERSION@ | |||
250 | VMAJ = @VMAJ@ | 254 | VMAJ = @VMAJ@ |
251 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 255 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
252 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 256 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
253 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
254 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
255 | XCB_CFLAGS = @XCB_CFLAGS@ | 257 | XCB_CFLAGS = @XCB_CFLAGS@ |
256 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 258 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
257 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 259 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -325,8 +327,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
325 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 327 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
326 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 328 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
327 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 329 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
328 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
329 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
330 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 330 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,10 +418,8 @@ AM_CPPFLAGS = \ | |||
418 | @PIXMAN_CFLAGS@ \ | 418 | @PIXMAN_CFLAGS@ \ |
419 | @evas_image_loader_generic_cflags@ \ | 419 | @evas_image_loader_generic_cflags@ \ |
420 | @EINA_CFLAGS@ \ | 420 | @EINA_CFLAGS@ \ |
421 | @EVIL_CFLAGS@ \ | 421 | @EVIL_CFLAGS@ |
422 | @WIN32_CPPFLAGS@ | ||
423 | 422 | ||
424 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
425 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) | 423 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) |
426 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la | 424 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la |
427 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c | 425 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c |