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/savers | |
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 '')
10 files changed, 26 insertions, 40 deletions
diff --git a/libraries/evas/src/modules/savers/Makefile.in b/libraries/evas/src/modules/savers/Makefile.in index 28236d9..629961c 100644 --- a/libraries/evas/src/modules/savers/Makefile.in +++ b/libraries/evas/src/modules/savers/Makefile.in | |||
@@ -161,6 +161,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
161 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 161 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
162 | EVIL_LIBS = @EVIL_LIBS@ | 162 | EVIL_LIBS = @EVIL_LIBS@ |
163 | EXEEXT = @EXEEXT@ | 163 | EXEEXT = @EXEEXT@ |
164 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
165 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
164 | FGREP = @FGREP@ | 166 | FGREP = @FGREP@ |
165 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 167 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
166 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 168 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -211,6 +213,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
211 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 213 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
212 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 214 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
213 | PKG_CONFIG = @PKG_CONFIG@ | 215 | PKG_CONFIG = @PKG_CONFIG@ |
216 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
217 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
214 | PNG_CFLAGS = @PNG_CFLAGS@ | 218 | PNG_CFLAGS = @PNG_CFLAGS@ |
215 | PNG_LIBS = @PNG_LIBS@ | 219 | PNG_LIBS = @PNG_LIBS@ |
216 | RANLIB = @RANLIB@ | 220 | RANLIB = @RANLIB@ |
@@ -229,8 +233,6 @@ VERSION = @VERSION@ | |||
229 | VMAJ = @VMAJ@ | 233 | VMAJ = @VMAJ@ |
230 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 234 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
231 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 235 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
232 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
233 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
234 | XCB_CFLAGS = @XCB_CFLAGS@ | 236 | XCB_CFLAGS = @XCB_CFLAGS@ |
235 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 237 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
236 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 238 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -304,8 +306,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
304 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 306 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
305 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 307 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
306 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 308 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
307 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
308 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
309 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 309 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
310 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 310 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
311 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 311 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/savers/edb/Makefile.in b/libraries/evas/src/modules/savers/edb/Makefile.in index 2ed29ec..7637c35 100644 --- a/libraries/evas/src/modules/savers/edb/Makefile.in +++ b/libraries/evas/src/modules/savers/edb/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/savers/eet/Makefile.am b/libraries/evas/src/modules/savers/eet/Makefile.am index 1c7f71c..ffa5bb5 100644 --- a/libraries/evas/src/modules/savers/eet/Makefile.am +++ b/libraries/evas/src/modules/savers/eet/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_eet_cflags@ | 11 | @evas_image_loader_eet_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_LOADER_EET | 13 | if BUILD_LOADER_EET |
16 | if !EVAS_STATIC_BUILD_EET | 14 | if !EVAS_STATIC_BUILD_EET |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/savers/eet/Makefile.in b/libraries/evas/src/modules/savers/eet/Makefile.in index 6564c18..70c76d1 100644 --- a/libraries/evas/src/modules/savers/eet/Makefile.in +++ b/libraries/evas/src/modules/savers/eet/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_eet_cflags@ | 419 | @evas_image_loader_eet_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH) | 421 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH) |
423 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_save_eet.c | 423 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_save_eet.c |
diff --git a/libraries/evas/src/modules/savers/jpeg/Makefile.am b/libraries/evas/src/modules/savers/jpeg/Makefile.am index 82a40ac..fee6cc3 100644 --- a/libraries/evas/src/modules/savers/jpeg/Makefile.am +++ b/libraries/evas/src/modules/savers/jpeg/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS= \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_jpeg_cflags@ | 11 | @evas_image_loader_jpeg_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_SAVER_JPEG | 13 | if BUILD_SAVER_JPEG |
16 | if !EVAS_STATIC_BUILD_JPEG | 14 | if !EVAS_STATIC_BUILD_JPEG |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/savers/jpeg/Makefile.in b/libraries/evas/src/modules/savers/jpeg/Makefile.in index e57c4f9..3e17f5b 100644 --- a/libraries/evas/src/modules/savers/jpeg/Makefile.in +++ b/libraries/evas/src/modules/savers/jpeg/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_jpeg_cflags@ | 419 | @evas_image_loader_jpeg_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) | 421 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) |
423 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_save_jpeg.c | 423 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_save_jpeg.c |
diff --git a/libraries/evas/src/modules/savers/png/Makefile.am b/libraries/evas/src/modules/savers/png/Makefile.am index 1429f2e..84b3325 100644 --- a/libraries/evas/src/modules/savers/png/Makefile.am +++ b/libraries/evas/src/modules/savers/png/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_png_cflags@ \ | 11 | @evas_image_loader_png_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | if BUILD_LOADER_PNG | 14 | if BUILD_LOADER_PNG |
18 | if !EVAS_STATIC_BUILD_PNG | 15 | if !EVAS_STATIC_BUILD_PNG |
diff --git a/libraries/evas/src/modules/savers/png/Makefile.in b/libraries/evas/src/modules/savers/png/Makefile.in index da04ff2..e6f26ca 100644 --- a/libraries/evas/src/modules/savers/png/Makefile.in +++ b/libraries/evas/src/modules/savers/png/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_png_cflags@ \ | 419 | @evas_image_loader_png_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
424 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) | 422 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) |
425 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la |
426 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@module_la_SOURCES = evas_image_save_png.c | 424 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@module_la_SOURCES = evas_image_save_png.c |
diff --git a/libraries/evas/src/modules/savers/tiff/Makefile.am b/libraries/evas/src/modules/savers/tiff/Makefile.am index 6d58d26..b75064f 100644 --- a/libraries/evas/src/modules/savers/tiff/Makefile.am +++ b/libraries/evas/src/modules/savers/tiff/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_tiff_cflags@ | 11 | @evas_image_loader_tiff_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_LOADER_TIFF | 13 | if BUILD_LOADER_TIFF |
16 | if !EVAS_STATIC_BUILD_TIFF | 14 | if !EVAS_STATIC_BUILD_TIFF |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/savers/tiff/Makefile.in b/libraries/evas/src/modules/savers/tiff/Makefile.in index 8f4411f..3272ba9 100644 --- a/libraries/evas/src/modules/savers/tiff/Makefile.in +++ b/libraries/evas/src/modules/savers/tiff/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_tiff_cflags@ | 419 | @evas_image_loader_tiff_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) | 421 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) |
423 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_save_tiff.c | 423 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_save_tiff.c |