aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-04 11:51:42 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-04 11:51:42 +0000
commitc15e9c6575c3b5f39ded167dda5259de3de96151 (patch)
tree5115d7ae3620af24c2bc094cd062575af7adeda9
parenta5ac6a987caec5a7f7596a25d0a065b9cc94c50c (diff)
downloadefl-c15e9c6575c3b5f39ded167dda5259de3de96151.tar.gz
efl-c15e9c6575c3b5f39ded167dda5259de3de96151.tar.xz
efl-c15e9c6575c3b5f39ded167dda5259de3de96151.zip
merge: and now Evas
I've tested make -j 3 install and it works nicely I've tested expedite with software and opengl xlib, and it works. Not tested other engines, so please report any problems (engines or other) on the ML. TODO: examples and tests, I'll add them later ISSUE: Eina_Unicode size check. It indirectly depends on eina_config.h, which is created at the end of the configure script. So its size is always 0. I don't know how that size is used, so I can't do a lot, for now. SVN revision: 78895
-rw-r--r--AUTHORS46
-rw-r--r--COPYING1
-rw-r--r--Makefile.am68
-rw-r--r--configure.ac967
-rw-r--r--data/Makefile.am9
-rw-r--r--data/evas/checkme (renamed from legacy/evas/data/checkme)0
-rw-r--r--m4/efl_attribute.m451
-rw-r--r--m4/efl_check_funcs.m476
-rw-r--r--m4/eina_config.m42
-rw-r--r--m4/evas_check_engine.m4 (renamed from legacy/evas/m4/evas_check_engine.m4)176
-rw-r--r--m4/evas_check_loader.m4534
-rw-r--r--m4/evas_dither.m4 (renamed from legacy/evas/m4/evas_dither.m4)0
-rw-r--r--old/ChangeLog.evas (renamed from legacy/evas/ChangeLog)0
-rw-r--r--old/NEWS.evas (renamed from legacy/evas/NEWS)0
-rw-r--r--old/README.evas (renamed from legacy/evas/README)0
-rw-r--r--pc/evas-direct3d.pc.in (renamed from legacy/evas/evas-direct3d.pc.in)0
-rw-r--r--pc/evas-directfb.pc.in (renamed from legacy/evas/evas-directfb.pc.in)0
-rw-r--r--pc/evas-fb.pc.in (renamed from legacy/evas/evas-fb.pc.in)0
-rw-r--r--pc/evas-opengl-cocoa.pc.in (renamed from legacy/evas/evas-opengl-cocoa.pc.in)0
-rw-r--r--pc/evas-opengl-sdl.pc.in (renamed from legacy/evas/evas-opengl-sdl.pc.in)0
-rw-r--r--pc/evas-opengl-x11.pc.in (renamed from legacy/evas/evas-opengl-x11.pc.in)0
-rw-r--r--pc/evas-psl1ght.pc.in (renamed from legacy/evas/evas-psl1ght.pc.in)0
-rw-r--r--pc/evas-software-buffer.pc.in (renamed from legacy/evas/evas-software-buffer.pc.in)0
-rw-r--r--pc/evas-software-ddraw.pc.in (renamed from legacy/evas/evas-software-ddraw.pc.in)0
-rw-r--r--pc/evas-software-gdi.pc.in (renamed from legacy/evas/evas-software-gdi.pc.in)0
-rw-r--r--pc/evas-software-sdl.pc.in (renamed from legacy/evas/evas-software-sdl.pc.in)0
-rw-r--r--pc/evas-software-x11.pc.in (renamed from legacy/evas/evas-software-x11.pc.in)0
-rw-r--r--pc/evas-wayland-egl.pc.in (renamed from legacy/evas/evas-wayland-egl.pc.in)0
-rw-r--r--pc/evas-wayland-shm.pc.in (renamed from legacy/evas/evas-wayland-shm.pc.in)0
-rw-r--r--pc/evas.pc.in (renamed from legacy/evas/evas.pc.in)6
-rw-r--r--src/Makefile.am3
-rw-r--r--src/Makefile_Eina.am4
-rw-r--r--src/Makefile_Evas.am1837
-rw-r--r--src/bin/evas/dummy_slave.c (renamed from legacy/evas/src/bin/dummy_slave.c)2
-rw-r--r--src/bin/evas/evas_cserve2.h (renamed from legacy/evas/src/bin/evas_cserve2.h)0
-rw-r--r--src/bin/evas/evas_cserve2_cache.c (renamed from legacy/evas/src/bin/evas_cserve2_cache.c)32
-rw-r--r--src/bin/evas/evas_cserve2_client.c (renamed from legacy/evas/src/bin/evas_cserve2_client.c)0
-rw-r--r--src/bin/evas/evas_cserve2_debug.c (renamed from legacy/evas/src/bin/evas_cserve2_debug.c)0
-rw-r--r--src/bin/evas/evas_cserve2_fonts.c (renamed from legacy/evas/src/bin/evas_cserve2_fonts.c)6
-rw-r--r--src/bin/evas/evas_cserve2_main.c (renamed from legacy/evas/src/bin/evas_cserve2_main.c)2
-rw-r--r--src/bin/evas/evas_cserve2_main_loop_linux.c (renamed from legacy/evas/src/bin/evas_cserve2_main_loop_linux.c)12
-rw-r--r--src/bin/evas/evas_cserve2_messages.c (renamed from legacy/evas/src/bin/evas_cserve2_messages.c)2
-rw-r--r--src/bin/evas/evas_cserve2_requests.c (renamed from legacy/evas/src/bin/evas_cserve2_requests.c)4
-rw-r--r--src/bin/evas/evas_cserve2_shm.c (renamed from legacy/evas/src/bin/evas_cserve2_shm.c)0
-rw-r--r--src/bin/evas/evas_cserve2_slave.c (renamed from legacy/evas/src/bin/evas_cserve2_slave.c)0
-rw-r--r--src/bin/evas/evas_cserve2_slave.h (renamed from legacy/evas/src/bin/evas_cserve2_slave.h)0
-rw-r--r--src/bin/evas/evas_cserve2_slaves.c (renamed from legacy/evas/src/bin/evas_cserve2_slaves.c)4
-rw-r--r--src/bin/evas/evas_cserve2_usage.c (renamed from legacy/evas/src/bin/evas_cserve2_usage.c)0
-rw-r--r--src/bin/evas/evas_cserve2_utils.c (renamed from legacy/evas/src/bin/evas_cserve2_utils.c)0
-rw-r--r--src/bin/evas/loaders/bmp/evas_image_load_bmp.c (renamed from legacy/evas/src/bin/loaders/bmp/evas_image_load_bmp.c)4
-rw-r--r--src/bin/evas/loaders/eet/evas_image_load_eet.c (renamed from legacy/evas/src/bin/loaders/eet/evas_image_load_eet.c)0
-rw-r--r--src/bin/evas/loaders/ico/evas_image_load_ico.c (renamed from legacy/evas/src/bin/loaders/ico/evas_image_load_ico.c)0
-rw-r--r--src/bin/evas/loaders/jpeg/evas_image_load_jpeg.c (renamed from legacy/evas/src/bin/loaders/jpeg/evas_image_load_jpeg.c)10
-rw-r--r--src/bin/evas/loaders/pmaps/evas_image_load_pmaps.c (renamed from legacy/evas/src/bin/loaders/pmaps/evas_image_load_pmaps.c)4
-rw-r--r--src/bin/evas/loaders/png/evas_image_load_png.c (renamed from legacy/evas/src/bin/loaders/png/evas_image_load_png.c)4
-rw-r--r--src/bin/evas/loaders/psd/evas_image_load_psd.c (renamed from legacy/evas/src/bin/loaders/psd/evas_image_load_psd.c)6
-rw-r--r--src/bin/evas/loaders/tga/evas_image_load_tga.c (renamed from legacy/evas/src/bin/loaders/tga/evas_image_load_tga.c)4
-rw-r--r--src/bin/evas/loaders/tiff/evas_image_load_tiff.c (renamed from legacy/evas/src/bin/loaders/tiff/evas_image_load_tiff.c)4
-rw-r--r--src/bin/evas/loaders/wbmp/evas_image_load_wbmp.c (renamed from legacy/evas/src/bin/loaders/wbmp/evas_image_load_wbmp.c)4
-rw-r--r--src/bin/evas/loaders/webp/evas_image_load_webp.c (renamed from legacy/evas/src/bin/loaders/webp/evas_image_load_webp.c)4
-rw-r--r--src/bin/evas/loaders/xpm/evas_image_load_xpm.c (renamed from legacy/evas/src/bin/loaders/xpm/evas_image_load_xpm.c)6
-rw-r--r--src/lib/evas/Evas.h (renamed from legacy/evas/src/lib/Evas.h)0
-rw-r--r--src/lib/evas/Evas_GL.h (renamed from legacy/evas/src/lib/Evas_GL.h)0
-rw-r--r--src/lib/evas/cache/evas_cache.h (renamed from legacy/evas/src/lib/cache/evas_cache.h)0
-rw-r--r--src/lib/evas/cache/evas_cache_engine_image.c (renamed from legacy/evas/src/lib/cache/evas_cache_engine_image.c)2
-rw-r--r--src/lib/evas/cache/evas_cache_image.c (renamed from legacy/evas/src/lib/cache/evas_cache_image.c)6
-rw-r--r--src/lib/evas/cache/evas_preload.c (renamed from legacy/evas/src/lib/cache/evas_preload.c)4
-rw-r--r--src/lib/evas/cache2/evas_cache2.c (renamed from legacy/evas/src/lib/cache2/evas_cache2.c)2
-rw-r--r--src/lib/evas/cache2/evas_cache2.h (renamed from legacy/evas/src/lib/cache2/evas_cache2.h)0
-rw-r--r--src/lib/evas/canvas/common_interfaces.c (renamed from legacy/evas/src/lib/canvas/common_interfaces.c)0
-rw-r--r--src/lib/evas/canvas/evas_async_events.c (renamed from legacy/evas/src/lib/canvas/evas_async_events.c)0
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c (renamed from legacy/evas/src/lib/canvas/evas_callbacks.c)0
-rw-r--r--src/lib/evas/canvas/evas_clip.c (renamed from legacy/evas/src/lib/canvas/evas_clip.c)0
-rw-r--r--src/lib/evas/canvas/evas_common_interface.c (renamed from legacy/evas/src/lib/canvas/evas_common_interface.c)0
-rw-r--r--src/lib/evas/canvas/evas_data.c (renamed from legacy/evas/src/lib/canvas/evas_data.c)0
-rw-r--r--src/lib/evas/canvas/evas_device.c (renamed from legacy/evas/src/lib/canvas/evas_device.c)0
-rw-r--r--src/lib/evas/canvas/evas_events.c (renamed from legacy/evas/src/lib/canvas/evas_events.c)0
-rw-r--r--src/lib/evas/canvas/evas_filter.c (renamed from legacy/evas/src/lib/canvas/evas_filter.c)26
-rw-r--r--src/lib/evas/canvas/evas_focus.c (renamed from legacy/evas/src/lib/canvas/evas_focus.c)0
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c (renamed from legacy/evas/src/lib/canvas/evas_font_dir.c)4
-rw-r--r--src/lib/evas/canvas/evas_gl.c (renamed from legacy/evas/src/lib/canvas/evas_gl.c)0
-rw-r--r--src/lib/evas/canvas/evas_key.c (renamed from legacy/evas/src/lib/canvas/evas_key.c)0
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c (renamed from legacy/evas/src/lib/canvas/evas_key_grab.c)0
-rw-r--r--src/lib/evas/canvas/evas_layer.c (renamed from legacy/evas/src/lib/canvas/evas_layer.c)0
-rw-r--r--src/lib/evas/canvas/evas_main.c (renamed from legacy/evas/src/lib/canvas/evas_main.c)0
-rw-r--r--src/lib/evas/canvas/evas_map.c (renamed from legacy/evas/src/lib/canvas/evas_map.c)0
-rw-r--r--src/lib/evas/canvas/evas_name.c (renamed from legacy/evas/src/lib/canvas/evas_name.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_box.c (renamed from legacy/evas/src/lib/canvas/evas_object_box.c)8
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c (renamed from legacy/evas/src/lib/canvas/evas_object_grid.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_image.c (renamed from legacy/evas/src/lib/canvas/evas_object_image.c)14
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c (renamed from legacy/evas/src/lib/canvas/evas_object_inform.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c (renamed from legacy/evas/src/lib/canvas/evas_object_intercept.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_line.c (renamed from legacy/evas/src/lib/canvas/evas_object_line.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_main.c (renamed from legacy/evas/src/lib/canvas/evas_object_main.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c (renamed from legacy/evas/src/lib/canvas/evas_object_polygon.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c (renamed from legacy/evas/src/lib/canvas/evas_object_rectangle.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c (renamed from legacy/evas/src/lib/canvas/evas_object_smart.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c (renamed from legacy/evas/src/lib/canvas/evas_object_smart_clipped.c)0
-rw-r--r--src/lib/evas/canvas/evas_object_table.c (renamed from legacy/evas/src/lib/canvas/evas_object_table.c)4
-rw-r--r--src/lib/evas/canvas/evas_object_text.c (renamed from legacy/evas/src/lib/canvas/evas_object_text.c)2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c (renamed from legacy/evas/src/lib/canvas/evas_object_textblock.c)6
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c (renamed from legacy/evas/src/lib/canvas/evas_object_textgrid.c)4
-rw-r--r--src/lib/evas/canvas/evas_rectangle.c (renamed from legacy/evas/src/lib/canvas/evas_rectangle.c)0
-rw-r--r--src/lib/evas/canvas/evas_render.c (renamed from legacy/evas/src/lib/canvas/evas_render.c)0
-rw-r--r--src/lib/evas/canvas/evas_smart.c (renamed from legacy/evas/src/lib/canvas/evas_smart.c)0
-rw-r--r--src/lib/evas/canvas/evas_stack.c (renamed from legacy/evas/src/lib/canvas/evas_stack.c)0
-rw-r--r--src/lib/evas/canvas/evas_stats.c (renamed from legacy/evas/src/lib/canvas/evas_stats.c)10
-rw-r--r--src/lib/evas/canvas/evas_touch_point.c (renamed from legacy/evas/src/lib/canvas/evas_touch_point.c)0
-rw-r--r--src/lib/evas/common/evas_blend.h (renamed from legacy/evas/src/lib/engines/common/evas_blend.h)0
-rw-r--r--src/lib/evas/common/evas_blend_main.c (renamed from legacy/evas/src/lib/engines/common/evas_blend_main.c)4
-rw-r--r--src/lib/evas/common/evas_blend_private.h (renamed from legacy/evas/src/lib/engines/common/evas_blend_private.h)0
-rw-r--r--src/lib/evas/common/evas_blit_main.c (renamed from legacy/evas/src/lib/engines/common/evas_blit_main.c)0
-rw-r--r--src/lib/evas/common/evas_convert_color.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_color.c)0
-rw-r--r--src/lib/evas/common/evas_convert_color.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_color.h)0
-rw-r--r--src/lib/evas/common/evas_convert_colorspace.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_colorspace.c)2
-rw-r--r--src/lib/evas/common/evas_convert_colorspace.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_colorspace.h)0
-rw-r--r--src/lib/evas/common/evas_convert_gry_1.c6
-rw-r--r--src/lib/evas/common/evas_convert_gry_1.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_gry_1.h)0
-rw-r--r--src/lib/evas/common/evas_convert_gry_8.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_gry_8.c)10
-rw-r--r--src/lib/evas/common/evas_convert_gry_8.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_gry_8.h)0
-rw-r--r--src/lib/evas/common/evas_convert_grypal_6.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c)2
-rw-r--r--src/lib/evas/common/evas_convert_grypal_6.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_grypal_6.h)0
-rw-r--r--src/lib/evas/common/evas_convert_main.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_main.c)2
-rw-r--r--src/lib/evas/common/evas_convert_main.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_main.h)0
-rw-r--r--src/lib/evas/common/evas_convert_rgb_16.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c)0
-rw-r--r--src/lib/evas/common/evas_convert_rgb_16.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_16.h)0
-rw-r--r--src/lib/evas/common/evas_convert_rgb_24.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c)6
-rw-r--r--src/lib/evas/common/evas_convert_rgb_24.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_24.h)0
-rw-r--r--src/lib/evas/common/evas_convert_rgb_32.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c)34
-rw-r--r--src/lib/evas/common/evas_convert_rgb_32.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_32.h)0
-rw-r--r--src/lib/evas/common/evas_convert_rgb_8.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c)0
-rw-r--r--src/lib/evas/common/evas_convert_rgb_8.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_rgb_8.h)0
-rw-r--r--src/lib/evas/common/evas_convert_yuv.c (renamed from legacy/evas/src/lib/engines/common/evas_convert_yuv.c)0
-rw-r--r--src/lib/evas/common/evas_convert_yuv.h (renamed from legacy/evas/src/lib/engines/common/evas_convert_yuv.h)0
-rw-r--r--src/lib/evas/common/evas_cpu.c (renamed from legacy/evas/src/lib/engines/common/evas_cpu.c)4
-rw-r--r--src/lib/evas/common/evas_draw.h (renamed from legacy/evas/src/lib/engines/common/evas_draw.h)0
-rw-r--r--src/lib/evas/common/evas_draw_main.c (renamed from legacy/evas/src/lib/engines/common/evas_draw_main.c)0
-rw-r--r--src/lib/evas/common/evas_font.h (renamed from legacy/evas/src/lib/engines/common/evas_font.h)6
-rw-r--r--src/lib/evas/common/evas_font_default_walk.x (renamed from legacy/evas/src/lib/engines/common/evas_font_default_walk.x)0
-rw-r--r--src/lib/evas/common/evas_font_draw.c (renamed from legacy/evas/src/lib/engines/common/evas_font_draw.c)2
-rw-r--r--src/lib/evas/common/evas_font_load.c (renamed from legacy/evas/src/lib/engines/common/evas_font_load.c)32
-rw-r--r--src/lib/evas/common/evas_font_main.c (renamed from legacy/evas/src/lib/engines/common/evas_font_main.c)10
-rw-r--r--src/lib/evas/common/evas_font_ot.c (renamed from legacy/evas/src/lib/engines/common/evas_font_ot.c)0
-rw-r--r--src/lib/evas/common/evas_font_ot.h (renamed from legacy/evas/src/lib/engines/common/evas_font_ot.h)0
-rw-r--r--src/lib/evas/common/evas_font_private.h (renamed from legacy/evas/src/lib/engines/common/evas_font_private.h)0
-rw-r--r--src/lib/evas/common/evas_font_query.c (renamed from legacy/evas/src/lib/engines/common/evas_font_query.c)4
-rw-r--r--src/lib/evas/common/evas_image.h (renamed from legacy/evas/src/lib/engines/common/evas_image.h)0
-rw-r--r--src/lib/evas/common/evas_image_data.c (renamed from legacy/evas/src/lib/engines/common/evas_image_data.c)2
-rw-r--r--src/lib/evas/common/evas_image_load.c (renamed from legacy/evas/src/lib/engines/common/evas_image_load.c)2
-rw-r--r--src/lib/evas/common/evas_image_main.c (renamed from legacy/evas/src/lib/engines/common/evas_image_main.c)2
-rw-r--r--src/lib/evas/common/evas_image_private.h (renamed from legacy/evas/src/lib/engines/common/evas_image_private.h)0
-rw-r--r--src/lib/evas/common/evas_image_save.c (renamed from legacy/evas/src/lib/engines/common/evas_image_save.c)0
-rw-r--r--src/lib/evas/common/evas_image_scalecache.c (renamed from legacy/evas/src/lib/engines/common/evas_image_scalecache.c)6
-rw-r--r--src/lib/evas/common/evas_line.h (renamed from legacy/evas/src/lib/engines/common/evas_line.h)0
-rw-r--r--src/lib/evas/common/evas_line_main.c (renamed from legacy/evas/src/lib/engines/common/evas_line_main.c)0
-rw-r--r--src/lib/evas/common/evas_map_image.c (renamed from legacy/evas/src/lib/engines/common/evas_map_image.c)4
-rw-r--r--src/lib/evas/common/evas_map_image.h (renamed from legacy/evas/src/lib/engines/common/evas_map_image.h)0
-rw-r--r--src/lib/evas/common/evas_map_image_core.c (renamed from legacy/evas/src/lib/engines/common/evas_map_image_core.c)0
-rw-r--r--src/lib/evas/common/evas_map_image_internal.c (renamed from legacy/evas/src/lib/engines/common/evas_map_image_internal.c)4
-rw-r--r--src/lib/evas/common/evas_map_image_loop.c (renamed from legacy/evas/src/lib/engines/common/evas_map_image_loop.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_pixel_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_pixel_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_pixel_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_pixel_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_pixel_mask_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_.c)0
-rw-r--r--src/lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_add_main_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_add_main_.c)20
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_i386.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_color_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_neon.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_sse3.c)4
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_i386.c)6
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c)6
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_sse3.c)6
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_master_sse3.c)0
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c)14
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_.c)18
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_i386.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_neon.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_sse3.c)14
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c)12
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c)6
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_neon.c)4
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_sse3.c)2
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c)0
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_sse3.c)8
-rw-r--r--src/lib/evas/common/evas_op_blend_main_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_blend_main_.c)20
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c)8
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_i386.c)8
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_color_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_neon.c)0
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_.c)6
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_neon.c)4
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_.c)8
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_.c)12
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_i386.c)10
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_neon.c)10
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_i386.c)8
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_.c)4
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_neon.c)4
-rw-r--r--src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_neon.c)8
-rw-r--r--src/lib/evas/common/evas_op_copy_main_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_copy_main_.c)20
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_pixel_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_pixel_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_pixel_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_mask_main_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mask_main_.c)10
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c)6
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_i386.c)2
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_pixel_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_.c)4
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_pixel_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_.c)8
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_pixel_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_i386.c)4
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_.c)2
-rw-r--r--src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_mul_main_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_mul_main_.c)10
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_mask_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_pixel_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_pixel_color_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_pixel_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_i386.c)0
-rw-r--r--src/lib/evas/common/evas_op_sub_main_.c (renamed from legacy/evas/src/lib/engines/common/evas_op_sub_main_.c)20
-rw-r--r--src/lib/evas/common/evas_pipe.c (renamed from legacy/evas/src/lib/engines/common/evas_pipe.c)2
-rw-r--r--src/lib/evas/common/evas_pipe.h (renamed from legacy/evas/src/lib/engines/common/evas_pipe.h)0
-rw-r--r--src/lib/evas/common/evas_polygon.h (renamed from legacy/evas/src/lib/engines/common/evas_polygon.h)0
-rw-r--r--src/lib/evas/common/evas_polygon_main.c (renamed from legacy/evas/src/lib/engines/common/evas_polygon_main.c)0
-rw-r--r--src/lib/evas/common/evas_rectangle.h (renamed from legacy/evas/src/lib/engines/common/evas_rectangle.h)0
-rw-r--r--src/lib/evas/common/evas_rectangle_main.c (renamed from legacy/evas/src/lib/engines/common/evas_rectangle_main.c)0
-rw-r--r--src/lib/evas/common/evas_regionbuf.c (renamed from legacy/evas/src/lib/engines/common/evas_regionbuf.c)0
-rw-r--r--src/lib/evas/common/evas_scale_main.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_main.c)2
-rw-r--r--src/lib/evas/common/evas_scale_main.h (renamed from legacy/evas/src/lib/engines/common/evas_scale_main.h)0
-rw-r--r--src/lib/evas/common/evas_scale_sample.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_sample.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth.h (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth.h)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler_down.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_down.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler_downx.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler_downx_downy.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler_downy.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler_noscale.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_noscale.c)0
-rw-r--r--src/lib/evas/common/evas_scale_smooth_scaler_up.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_up.c)0
-rw-r--r--src/lib/evas/common/evas_scale_span.c (renamed from legacy/evas/src/lib/engines/common/evas_scale_span.c)8
-rw-r--r--src/lib/evas/common/evas_scale_span.h (renamed from legacy/evas/src/lib/engines/common/evas_scale_span.h)0
-rw-r--r--src/lib/evas/common/evas_text_utils.c (renamed from legacy/evas/src/lib/engines/common/evas_text_utils.c)0
-rw-r--r--src/lib/evas/common/evas_text_utils.h (renamed from legacy/evas/src/lib/engines/common/evas_text_utils.h)0
-rw-r--r--src/lib/evas/common/evas_tiler.c (renamed from legacy/evas/src/lib/engines/common/evas_tiler.c)2
-rw-r--r--src/lib/evas/common/language/evas_bidi_utils.c (renamed from legacy/evas/src/lib/engines/common/language/evas_bidi_utils.c)0
-rw-r--r--src/lib/evas/common/language/evas_bidi_utils.h (renamed from legacy/evas/src/lib/engines/common/language/evas_bidi_utils.h)0
-rw-r--r--src/lib/evas/common/language/evas_language_utils.c (renamed from legacy/evas/src/lib/engines/common/language/evas_language_utils.c)0
-rw-r--r--src/lib/evas/common/language/evas_language_utils.h (renamed from legacy/evas/src/lib/engines/common/language/evas_language_utils.h)0
-rw-r--r--src/lib/evas/common/language/evas_script_table.h (renamed from legacy/evas/src/lib/engines/common/language/evas_script_table.h)0
-rw-r--r--src/lib/evas/cserve2/evas_cs2.h (renamed from legacy/evas/src/lib/cserve2/evas_cs2.h)0
-rw-r--r--src/lib/evas/cserve2/evas_cs2_client.c (renamed from legacy/evas/src/lib/cserve2/evas_cs2_client.c)2
-rw-r--r--src/lib/evas/cserve2/evas_cs2_image_data.c (renamed from legacy/evas/src/lib/cserve2/evas_cs2_image_data.c)0
-rw-r--r--src/lib/evas/cserve2/evas_cs2_private.h (renamed from legacy/evas/src/lib/cserve2/evas_cs2_private.h)0
-rw-r--r--src/lib/evas/cserve2/evas_cs2_utils.c (renamed from legacy/evas/src/lib/cserve2/evas_cs2_utils.c)0
-rw-r--r--src/lib/evas/cserve2/evas_cs2_utils.h (renamed from legacy/evas/src/lib/cserve2/evas_cs2_utils.h)0
-rw-r--r--src/lib/evas/file/evas_module.c (renamed from legacy/evas/src/lib/file/evas_module.c)0
-rw-r--r--src/lib/evas/file/evas_module.h (renamed from legacy/evas/src/lib/file/evas_module.h)0
-rw-r--r--src/lib/evas/file/evas_path.c (renamed from legacy/evas/src/lib/file/evas_path.c)0
-rw-r--r--src/lib/evas/file/evas_path.h (renamed from legacy/evas/src/lib/file/evas_path.h)0
-rw-r--r--src/lib/evas/include/evas_blend_ops.h (renamed from legacy/evas/src/lib/include/evas_blend_ops.h)4
-rw-r--r--src/lib/evas/include/evas_common.h (renamed from legacy/evas/src/lib/include/evas_common.h)38
-rw-r--r--src/lib/evas/include/evas_inline.x (renamed from legacy/evas/src/lib/include/evas_inline.x)10
-rw-r--r--src/lib/evas/include/evas_macros.h (renamed from legacy/evas/src/lib/include/evas_macros.h)0
-rw-r--r--src/lib/evas/include/evas_mmx.h (renamed from legacy/evas/src/lib/include/evas_mmx.h)0
-rw-r--r--src/lib/evas/include/evas_options.h (renamed from legacy/evas/src/lib/include/evas_options.h)0
-rw-r--r--src/lib/evas/include/evas_private.h (renamed from legacy/evas/src/lib/include/evas_private.h)15
-rw-r--r--src/lib/evas/main.c (renamed from legacy/evas/src/lib/main.c)4
-rw-r--r--src/modules/evas/engines/buffer/Evas_Engine_Buffer.h (renamed from legacy/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h)0
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.c (renamed from legacy/evas/src/modules/engines/buffer/evas_engine.c)14
-rw-r--r--src/modules/evas/engines/buffer/evas_engine.h (renamed from legacy/evas/src/modules/engines/buffer/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/buffer/evas_outbuf.c (renamed from legacy/evas/src/modules/engines/buffer/evas_outbuf.c)0
-rw-r--r--src/modules/evas/engines/direct3d/Evas_Engine_Direct3D.h (renamed from legacy/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h)0
-rw-r--r--src/modules/evas/engines/direct3d/array.h (renamed from legacy/evas/src/modules/engines/direct3d/array.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_buffer.c (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_buffer.c)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_context.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_context.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_device.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_device.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_image_cache.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_main.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_font.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_font.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_image.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_image.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_line.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_line.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_object_rect.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_scene.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_scene.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h)0
-rw-r--r--src/modules/evas/engines/direct3d/evas_engine.c (renamed from legacy/evas/src/modules/engines/direct3d/evas_engine.c)4
-rw-r--r--src/modules/evas/engines/direct3d/evas_engine.h (renamed from legacy/evas/src/modules/engines/direct3d/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/direct3d/ref.h (renamed from legacy/evas/src/modules/engines/direct3d/ref.h)0
-rw-r--r--src/modules/evas/engines/directfb/Evas_Engine_DirectFB.h (renamed from legacy/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h)0
-rw-r--r--src/modules/evas/engines/directfb/evas_engine.c (renamed from legacy/evas/src/modules/engines/directfb/evas_engine.c)54
-rw-r--r--src/modules/evas/engines/directfb/evas_engine.h (renamed from legacy/evas/src/modules/engines/directfb/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/directfb/polygon.c (renamed from legacy/evas/src/modules/engines/directfb/polygon.c)2
-rw-r--r--src/modules/evas/engines/fb/Evas_Engine_FB.h (renamed from legacy/evas/src/modules/engines/fb/Evas_Engine_FB.h)0
-rw-r--r--src/modules/evas/engines/fb/evas_engine.c (renamed from legacy/evas/src/modules/engines/fb/evas_engine.c)12
-rw-r--r--src/modules/evas/engines/fb/evas_engine.h (renamed from legacy/evas/src/modules/engines/fb/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/fb/evas_fb.h (renamed from legacy/evas/src/modules/engines/fb/evas_fb.h)0
-rw-r--r--src/modules/evas/engines/fb/evas_fb_main.c (renamed from legacy/evas/src/modules/engines/fb/evas_fb_main.c)2
-rw-r--r--src/modules/evas/engines/fb/evas_outbuf.c (renamed from legacy/evas/src/modules/engines/fb/evas_outbuf.c)0
-rw-r--r--src/modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h (renamed from legacy/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h)0
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.c (renamed from legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c)70
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_engine.h (renamed from legacy/evas/src/modules/engines/gl_cocoa/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m (renamed from legacy/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_api.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext.h (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.h)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext_def.h)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_common.h)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_context.c)4
-rwxr-xr-xsrc/modules/evas/engines/gl_common/evas_gl_core.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_core.c)4
-rwxr-xr-xsrc/modules/evas/engines/gl_common/evas_gl_core.h (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_core.h)0
-rwxr-xr-xsrc/modules/evas/engines/gl_common/evas_gl_core_private.h (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_core_private.h)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_filter.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_filter.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_font.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_font.c)2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_image.c)2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_line.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_line.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_polygon.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_polygon.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_private.h (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_private.h)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_rectangle.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_rectangle.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_shader.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_shader.c)0
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c (renamed from legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c)4
-rw-r--r--src/modules/evas/engines/gl_common/shader/.gitignore (renamed from legacy/evas/src/modules/engines/gl_common/shader/.gitignore)0
-rwxr-xr-xsrc/modules/evas/engines/gl_common/shader/compile.sh (renamed from legacy/evas/src/modules/engines/gl_common/shader/compile.sh)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_bgra.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_bgra.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_blur_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert_bgra.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert_bgra.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_invert_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/font_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/font_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/font_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/font_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/font_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/font_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/font_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/font_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_bgra_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_mask_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_mask_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_mask_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_mask_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_nomul_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_nomul_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_nomul_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_nomul_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/img_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/img_vert.shd)0
-rwxr-xr-xsrc/modules/evas/engines/gl_common/shader/make-c-str.sh (renamed from legacy/evas/src/modules/engines/gl_common/shader/make-c-str.sh)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/nv12_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/rect_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/rect_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/rect_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/rect_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/rect_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/rect_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/rect_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/rect_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_nomul_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_nomul_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_nomul_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_nomul_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/tex_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/tex_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuv_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_nomul_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_vert.h (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.h)0
-rw-r--r--src/modules/evas/engines/gl_common/shader/yuy2_vert.shd (renamed from legacy/evas/src/modules/engines/gl_common/shader/yuy2_vert.shd)0
-rw-r--r--src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h (renamed from legacy/evas/src/modules/engines/gl_sdl/Evas_Engine_GL_SDL.h)0
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.c (renamed from legacy/evas/src/modules/engines/gl_sdl/evas_engine.c)38
-rw-r--r--src/modules/evas/engines/gl_sdl/evas_engine.h (renamed from legacy/evas/src/modules/engines/gl_sdl/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h (renamed from legacy/evas/src/modules/engines/gl_x11/Evas_Engine_GL_X11.h)0
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c (renamed from legacy/evas/src/modules/engines/gl_x11/evas_engine.c)84
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.h (renamed from legacy/evas/src/modules/engines/gl_x11/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/gl_x11/evas_x_main.c (renamed from legacy/evas/src/modules/engines/gl_x11/evas_x_main.c)0
-rw-r--r--src/modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h (renamed from legacy/evas/src/modules/engines/psl1ght/Evas_Engine_PSL1GHT.h)0
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.c (renamed from legacy/evas/src/modules/engines/psl1ght/evas_engine.c)6
-rw-r--r--src/modules/evas/engines/psl1ght/evas_engine.h (renamed from legacy/evas/src/modules/engines/psl1ght/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/psl1ght/rsxutil.c (renamed from legacy/evas/src/modules/engines/psl1ght/rsxutil.c)0
-rw-r--r--src/modules/evas/engines/psl1ght/rsxutil.h (renamed from legacy/evas/src/modules/engines/psl1ght/rsxutil.h)0
-rw-r--r--src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h (renamed from legacy/evas/src/modules/engines/software_ddraw/Evas_Engine_Software_DDraw.h)0
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c (renamed from legacy/evas/src/modules/engines/software_ddraw/evas_ddraw_buffer.c)0
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp (renamed from legacy/evas/src/modules/engines/software_ddraw/evas_ddraw_main.cpp)0
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_engine.c (renamed from legacy/evas/src/modules/engines/software_ddraw/evas_engine.c)0
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_engine.h (renamed from legacy/evas/src/modules/engines/software_ddraw/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/software_ddraw/evas_outbuf.c (renamed from legacy/evas/src/modules/engines/software_ddraw/evas_outbuf.c)0
-rw-r--r--src/modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h (renamed from legacy/evas/src/modules/engines/software_gdi/Evas_Engine_Software_Gdi.h)0
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.c (renamed from legacy/evas/src/modules/engines/software_gdi/evas_engine.c)4
-rw-r--r--src/modules/evas/engines/software_gdi/evas_engine.h (renamed from legacy/evas/src/modules/engines/software_gdi/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/software_gdi/evas_gdi_buffer.c (renamed from legacy/evas/src/modules/engines/software_gdi/evas_gdi_buffer.c)0
-rw-r--r--src/modules/evas/engines/software_gdi/evas_gdi_main.c (renamed from legacy/evas/src/modules/engines/software_gdi/evas_gdi_main.c)2
-rw-r--r--src/modules/evas/engines/software_gdi/evas_outbuf.c (renamed from legacy/evas/src/modules/engines/software_gdi/evas_outbuf.c)4
-rw-r--r--src/modules/evas/engines/software_generic/evas_engine.c (renamed from legacy/evas/src/modules/engines/software_generic/evas_engine.c)212
-rw-r--r--src/modules/evas/engines/software_x11/Evas_Engine_Software_X11.h (renamed from legacy/evas/src/modules/engines/software_x11/Evas_Engine_Software_X11.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_engine.c)8
-rw-r--r--src/modules/evas/engines/software_x11/evas_engine.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_x_egl.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_x_egl.c)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_x_egl.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_x_egl.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_buffer.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_buffer.c)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_buffer.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_buffer.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_color.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_color.c)2
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_color.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_color.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_main.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_main.c)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_outbuf.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.c)2
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_outbuf.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_outbuf.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.c)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xcb_xdefaults.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xcb_xdefaults.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_buffer.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.c)2
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_buffer.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_buffer.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_color.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_color.c)2
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_color.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_color.h)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_main.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_main.c)0
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_outbuf.c (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.c)2
-rw-r--r--src/modules/evas/engines/software_x11/evas_xlib_outbuf.h (renamed from legacy/evas/src/modules/engines/software_x11/evas_xlib_outbuf.h)0
-rw-r--r--src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h (renamed from legacy/evas/src/modules/engines/wayland_egl/Evas_Engine_Wayland_Egl.h)0
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.c (renamed from legacy/evas/src/modules/engines/wayland_egl/evas_engine.c)94
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_engine.h (renamed from legacy/evas/src/modules/engines/wayland_egl/evas_engine.h)0
-rw-r--r--src/modules/evas/engines/wayland_egl/evas_wl_main.c (renamed from legacy/evas/src/modules/engines/wayland_egl/evas_wl_main.c)0
-rw-r--r--src/modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h (renamed from legacy/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h)0
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.c (renamed from legacy/evas/src/modules/engines/wayland_shm/evas_engine.c)14
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_engine.h (renamed from legacy/evas/src/modules/engines/wayland_shm/evas_engine.h)6
-rw-r--r--src/modules/evas/engines/wayland_shm/evas_outbuf.c (renamed from legacy/evas/src/modules/engines/wayland_shm/evas_outbuf.c)0
-rw-r--r--src/modules/evas/loaders/bmp/evas_image_load_bmp.c (renamed from legacy/evas/src/modules/loaders/bmp/evas_image_load_bmp.c)6
-rw-r--r--src/modules/evas/loaders/eet/evas_image_load_eet.c (renamed from legacy/evas/src/modules/loaders/eet/evas_image_load_eet.c)2
-rw-r--r--src/modules/evas/loaders/generic/evas_image_load_generic.c (renamed from legacy/evas/src/modules/loaders/generic/evas_image_load_generic.c)2
-rw-r--r--src/modules/evas/loaders/gif/evas_image_load_gif.c (renamed from legacy/evas/src/modules/loaders/gif/evas_image_load_gif.c)6
-rw-r--r--src/modules/evas/loaders/ico/evas_image_load_ico.c (renamed from legacy/evas/src/modules/loaders/ico/evas_image_load_ico.c)2
-rw-r--r--src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c (renamed from legacy/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c)12
-rw-r--r--src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c (renamed from legacy/evas/src/modules/loaders/pmaps/evas_image_load_pmaps.c)6
-rw-r--r--src/modules/evas/loaders/png/evas_image_load_png.c (renamed from legacy/evas/src/modules/loaders/png/evas_image_load_png.c)6
-rw-r--r--src/modules/evas/loaders/psd/evas_image_load_psd.c (renamed from legacy/evas/src/modules/loaders/psd/evas_image_load_psd.c)12
-rw-r--r--src/modules/evas/loaders/svg/evas_image_load_esvg.c (renamed from legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c)6
-rw-r--r--src/modules/evas/loaders/tga/evas_image_load_tga.c (renamed from legacy/evas/src/modules/loaders/tga/evas_image_load_tga.c)6
-rw-r--r--src/modules/evas/loaders/tiff/evas_image_load_tiff.c (renamed from legacy/evas/src/modules/loaders/tiff/evas_image_load_tiff.c)6
-rw-r--r--src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c (renamed from legacy/evas/src/modules/loaders/wbmp/evas_image_load_wbmp.c)6
-rw-r--r--src/modules/evas/loaders/webp/evas_image_load_webp.c (renamed from legacy/evas/src/modules/loaders/webp/evas_image_load_webp.c)6
-rw-r--r--src/modules/evas/loaders/xpm/evas_image_load_xpm.c (renamed from legacy/evas/src/modules/loaders/xpm/evas_image_load_xpm.c)8
-rw-r--r--src/modules/evas/savers/eet/evas_image_save_eet.c (renamed from legacy/evas/src/modules/savers/eet/evas_image_save_eet.c)2
-rw-r--r--src/modules/evas/savers/jpeg/evas_image_save_jpeg.c (renamed from legacy/evas/src/modules/savers/jpeg/evas_image_save_jpeg.c)8
-rw-r--r--src/modules/evas/savers/png/evas_image_save_png.c (renamed from legacy/evas/src/modules/savers/png/evas_image_save_png.c)4
-rw-r--r--src/modules/evas/savers/tiff/evas_image_save_tiff.c (renamed from legacy/evas/src/modules/savers/tiff/evas_image_save_tiff.c)6
-rw-r--r--src/static_libs/liblinebreak/AUTHORS (renamed from legacy/evas/src/static_deps/liblinebreak/AUTHORS)0
-rw-r--r--src/static_libs/liblinebreak/ChangeLog (renamed from legacy/evas/src/static_deps/liblinebreak/ChangeLog)0
-rw-r--r--src/static_libs/liblinebreak/LICENCE (renamed from legacy/evas/src/static_deps/liblinebreak/LICENCE)0
-rw-r--r--src/static_libs/liblinebreak/LineBreak1.sed (renamed from legacy/evas/src/static_deps/liblinebreak/LineBreak1.sed)0
-rw-r--r--src/static_libs/liblinebreak/LineBreak2.sed (renamed from legacy/evas/src/static_deps/liblinebreak/LineBreak2.sed)0
-rw-r--r--src/static_libs/liblinebreak/NEWS (renamed from legacy/evas/src/static_deps/liblinebreak/NEWS)0
-rw-r--r--src/static_libs/liblinebreak/README (renamed from legacy/evas/src/static_deps/liblinebreak/README)0
-rw-r--r--src/static_libs/liblinebreak/filter_dup.c (renamed from legacy/evas/src/static_deps/liblinebreak/filter_dup.c)0
-rwxr-xr-xsrc/static_libs/liblinebreak/gen_linebreak_data.sh (renamed from legacy/evas/src/static_deps/liblinebreak/gen_linebreak_data.sh)0
-rwxr-xr-xsrc/static_libs/liblinebreak/gen_wordbreak_data.sh (renamed from legacy/evas/src/static_deps/liblinebreak/gen_wordbreak_data.sh)0
-rw-r--r--src/static_libs/liblinebreak/linebreak.c (renamed from legacy/evas/src/static_deps/liblinebreak/linebreak.c)0
-rw-r--r--src/static_libs/liblinebreak/linebreak.h (renamed from legacy/evas/src/static_deps/liblinebreak/linebreak.h)0
-rw-r--r--src/static_libs/liblinebreak/linebreakdata.c (renamed from legacy/evas/src/static_deps/liblinebreak/linebreakdata.c)0
-rw-r--r--src/static_libs/liblinebreak/linebreakdata1.tmpl (renamed from legacy/evas/src/static_deps/liblinebreak/linebreakdata1.tmpl)0
-rw-r--r--src/static_libs/liblinebreak/linebreakdata2.tmpl (renamed from legacy/evas/src/static_deps/liblinebreak/linebreakdata2.tmpl)0
-rw-r--r--src/static_libs/liblinebreak/linebreakdata3.tmpl (renamed from legacy/evas/src/static_deps/liblinebreak/linebreakdata3.tmpl)0
-rw-r--r--src/static_libs/liblinebreak/linebreakdef.c (renamed from legacy/evas/src/static_deps/liblinebreak/linebreakdef.c)0
-rw-r--r--src/static_libs/liblinebreak/linebreakdef.h (renamed from legacy/evas/src/static_deps/liblinebreak/linebreakdef.h)0
-rwxr-xr-xsrc/static_libs/liblinebreak/sort_numeric_hex.py (renamed from legacy/evas/src/static_deps/liblinebreak/sort_numeric_hex.py)0
-rw-r--r--src/static_libs/liblinebreak/wordbreak.c (renamed from legacy/evas/src/static_deps/liblinebreak/wordbreak.c)0
-rw-r--r--src/static_libs/liblinebreak/wordbreak.h (renamed from legacy/evas/src/static_deps/liblinebreak/wordbreak.h)0
-rw-r--r--src/static_libs/liblinebreak/wordbreakdata.x (renamed from legacy/evas/src/static_deps/liblinebreak/wordbreakdata.x)0
-rw-r--r--src/static_libs/liblinebreak/wordbreakdef.h (renamed from legacy/evas/src/static_deps/liblinebreak/wordbreakdef.h)0
547 files changed, 4493 insertions, 908 deletions
diff --git a/AUTHORS b/AUTHORS
index 7b4bc356c..ac1e58d60 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,6 +63,52 @@ Lionel Orry <lionel.orry@gmail.com>
Jérôme Pinot <ngc891@gmail.com>
Leandro Santiago <leandrosansilva@gmail.com>
+Evas
+----
+
+Carsten Haitzler <raster@rasterman.com>
+Till Adam <till@adam-lilienthal.de>
+Steve Ireland <sireland@pobox.com>
+Brett Nash <nash@fluffyspider.com.au>
+Tilman Sauerbeck <tilman@code-monkey.de>
+Corey Donohoe <atmos@atmos.org>
+Yuri Hudobin <glassy_ape@users.sourceforge.net>
+Nathan Ingersoll <ningerso@d.umn.edu>
+Willem Monsuwe <willem@stack.nl>
+Jose O Gonzalez <jose_ogp@juno.com>
+Bernhard Nemec <Bernhard.Nemec@viasyshc.com>
+Jorge Luis Zapata Muga <jorgeluis.zapata@gmail.com>
+Cedric Bail <cedric.bail@free.fr>
+Gustavo Sverzut Barbieri <barbieri@gmail.com>
+Vincent Torri <vtorri at univ-evry dot fr>
+Tim Horton <hortont424@gmail.com>
+Tom Hacohen <tom@stosb.com>
+Mathieu Taillefumier <mathieu.taillefumier@free.fr>
+Iván Briano <ivan@profusion.mobi>
+Gustavo Lima Chaves <glima@profusion.mobi>
+Samsung Electronics
+Samsung SAIT
+Sung W. Park <sungwoo@gmail.com>
+Jiyoun Park <jy0703.park@samsung.com>
+Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
+Thierry el Borgi <thierry@substantiel.fr>
+Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com>
+ChunEon Park <hermet@hermet.pe.kr>
+Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
+Seungsoo Woo <om101.woo@samsung.com>
+Youness Alaoui <kakaroto@kakaroto.homelinux.net>
+Jim Kukunas <james.t.kukunas@linux.intel.com>
+Nicolas Aguirre <aguirre.nicolas@gmail.com>
+Rafal Krypa <r.krypa@samsung.com>
+Hyoyoung Chang <hyoyoung@gmail.com>
+Jérôme Pinot <ngc891@gmail.com>
+Rafael Antognolli <antognolli@profusion.mobi>
+Daniel Zaoui <daniel.zaoui@samsung.com>
+Christophe Sadoine <chris@indefini.org>
+Igor Murzov <e-mail@date.by>
+Sohyun Kim <anna1014.kim@samsung.com>
+Boris Faure <billiob@gmail.com>
+
Embryo
------
diff --git a/COPYING b/COPYING
index 40367789b..4cbd1f864 100644
--- a/COPYING
+++ b/COPYING
@@ -5,4 +5,5 @@ evil: licenses/COPYING.BSD
eet: licenses/COPYING.BSD
eina: licenses/COPYING.LGPL
eo: licenses/COPYING.BSD
+evas: licenses/COPYING.BSD
embryo: licenses/COPYING.BSD
diff --git a/Makefile.am b/Makefile.am
index 6cca8553b..45dd848e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ MAINTAINERCLEANFILES = \
Makefile.in \
aclocal.m4 \
compile \
+config.cache-env \
config.guess \
config.h.in \
config.h.in~ \
@@ -33,6 +34,7 @@ m4/evil_windows.m4 \
m4/eina_check.m4
EXTRA_DIST += \
+autogen.sh \
licenses/COPYING.LGPL \
licenses/COPYING.GPL \
licenses/COPYING.BSD \
@@ -50,6 +52,19 @@ pc/evil.pc \
pc/eina.pc \
pc/eet.pc \
pc/eo.pc \
+pc/evas.pc \
+pc/evas-directfb.pc \
+pc/evas-fb.pc \
+pc/evas-opengl-x11.pc \
+pc/evas-opengl-sdl.pc \
+pc/evas-software-buffer.pc \
+pc/evas-software-x11.pc \
+pc/evas-software-gdi.pc \
+pc/evas-software-ddraw.pc \
+pc/evas-direct3d.pc \
+pc/evas-psl1ght.pc \
+pc/evas-wayland-shm.pc \
+pc/evas-wayland-egl.pc \
pc/embryo.pc
pkgconfigdir = $(libdir)/pkgconfig
@@ -63,8 +78,61 @@ pkgconfig_DATA += \
pc/eina.pc \
pc/eo.pc \
pc/eet.pc \
+pc/evas.pc \
pc/embryo.pc
+if BUILD_ENGINE_SOFTWARE_X11
+pkgconfig_DATA += pc/evas-software-x11.pc
+endif
+
+if BUILD_ENGINE_DIRECTFB
+pkgconfig_DATA += pc/evas-directfb.pc
+endif
+
+if BUILD_ENGINE_FB
+pkgconfig_DATA += pc/evas-fb.pc
+endif
+
+if BUILD_ENGINE_BUFFER
+pkgconfig_DATA += pc/evas-software-buffer.pc
+endif
+
+if BUILD_ENGINE_GL_X11
+pkgconfig_DATA += pc/evas-opengl-x11.pc
+endif
+
+if BUILD_ENGINE_GL_SDL
+pkgconfig_DATA += pc/evas-opengl-sdl.pc
+endif
+
+if BUILD_ENGINE_GL_COCOA
+pkgconfig_DATA += pc/evas-opengl-cocoa.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_GDI
+pkgconfig_DATA += pc/evas-software-gdi.pc
+endif
+
+if BUILD_ENGINE_SOFTWARE_DDRAW
+pkgconfig_DATA += pc/evas-software-ddraw.pc
+endif
+
+if BUILD_ENGINE_DIRECT3D
+pkgconfig_DATA += pc/evas-direct3d.pc
+endif
+
+if BUILD_ENGINE_PSL1GHT
+pkgconfig_DATA += pc/evas-psl1ght.pc
+endif
+
+if BUILD_ENGINE_WAYLAND_SHM
+pkgconfig_DATA += pc/evas-wayland-shm.pc
+endif
+
+if BUILD_ENGINE_WAYLAND_EGL
+pkgconfig_DATA += pc/evas-wayland-egl.pc
+endif
+
.PHONY: doc benchmark examples install-examples
diff --git a/configure.ac b/configure.ac
index 5e4283bb0..5052cd7f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ requirements_libs_evil=""
requirements_libs_eina=""
requirements_libs_eo=""
requirements_libs_eet=""
-#requirements_libs_evas=""
+requirements_libs_evas=""
#requirements_libs_ecore=""
requirements_libs_embryo=""
#requirements_libs_eio=""
@@ -71,7 +71,7 @@ requirements_libs_deps_evil=""
requirements_libs_deps_eina=""
requirements_libs_deps_eo=""
requirements_libs_deps_eet=""
-#requirements_libs_deps_evas=""
+requirements_libs_deps_evas=""
#requirements_libs_deps_ecore=""
requirements_libs_deps_embryo=""
#requirements_libs_deps_eio=""
@@ -86,7 +86,7 @@ requirements_libs_deps_embryo=""
requirements_pc_eina=""
requirements_pc_eo=""
requirements_pc_eet=""
-#requirements_pc_evas=""
+requirements_pc_evas=""
#requirements_pc_ecore=""
requirements_pc_embryo=""
#requirements_pc_eio=""
@@ -101,7 +101,7 @@ requirements_pc_embryo=""
requirements_pc_deps_eina=""
requirements_pc_deps_eo=""
requirements_pc_deps_eet=""
-#requirements_pc_deps_evas=""
+requirements_pc_deps_evas=""
#requirements_pc_deps_ecore=""
requirements_pc_deps_embryo=""
#requirements_pc_deps_eio=""
@@ -117,7 +117,7 @@ AC_SUBST([requirements_libs_evil])
AC_SUBST([requirements_libs_eina])
AC_SUBST([requirements_libs_eo])
AC_SUBST([requirements_libs_eet])
-#AC_SUBST([requirements_libs_evas])
+AC_SUBST([requirements_libs_evas])
#AC_SUBST([requirements_libs_ecore])
AC_SUBST([requirements_libs_embryo])
#AC_SUBST([requirements_libs_eio])
@@ -132,7 +132,7 @@ AC_SUBST([requirements_libs_embryo])
AC_SUBST([requirements_pc_eina])
AC_SUBST([requirements_pc_eo])
AC_SUBST([requirements_pc_eet])
-#AC_SUBST([requirements_pc_evas])
+AC_SUBST([requirements_pc_evas])
#AC_SUBST([requirements_pc_ecore])
AC_SUBST([requirements_pc_embryo])
#AC_SUBST([requirements_pc_eio])
@@ -179,6 +179,7 @@ case "$host_os" in
;;
esac
+AC_SUBST([MODULE_ARCH])
AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
@@ -225,6 +226,32 @@ AC_SUBST([release_info])
### compilers
+# rw_PROG_OBJC_WORKS
+# Check whether the Objective C compiler works.
+AC_DEFUN([rw_PROG_OBJC_WORKS],
+[m4_ifdef([AC_PROG_OBJC], [AC_REQUIRE([AC_PROG_OBJC])dnl
+AC_CACHE_CHECK([whether the Objective C compiler works],
+ [rw_cv_prog_objc_works],
+ [AC_LANG_PUSH([Objective C])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+ [rw_cv_prog_objc_works=yes],
+ [rw_cv_prog_objc_works=no])
+ AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no])
+])
+
+m4_ifdef([AC_PROG_OBJC],
+ [
+ AC_PROG_OBJC
+ _AM_DEPENDENCIES(OBJC)
+ ],
+ [
+ dnl#AC_CHECK_TOOL([OBJC], [gcc])
+ dnl#AC_SUBST([OBJC])
+ dnl#AC_SUBST([OBJCFLAGS])
+ ])
+
+rw_PROG_OBJC_WORKS
+
AM_PROG_AS
AC_PROG_CXX
AC_LANG(C)
@@ -263,6 +290,8 @@ siginfo.h \
stdint.h \
strings.h \
sys/types.h \
+sys/param.h \
+sys/mman.h \
unistd.h \
])
@@ -312,6 +341,11 @@ case "${build_profile}" in
;;
esac
+EFL_ATTRIBUTE_VECTOR
+EFL_ATTRIBUTE_ALWAYS_INLINE
+
+EFL_LIBS=
+AC_SUBST([EFL_LIBS])
#### Checks for linker characteristics
@@ -817,6 +851,910 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
#### End of Eo
+#### Evas
+
+AC_MSG_NOTICE([Evas checks])
+
+### Additional options to configure
+
+# when used, that option makes configure script fails when
+# a requirement is selected, but not met.
+use_strict="no"
+AC_ARG_ENABLE([strict],
+ [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default==disabled@:>@])],
+ [use_strict="yes"],
+ [use_strict="no"])
+
+# Simple X11 build/link
+AC_ARG_ENABLE([simple-x11],
+ [AC_HELP_STRING([--enable-simple-x11],
+ [enable simple x11 linking. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_evas_simple_x11="yes"
+ else
+ want_evas_simple_x11="no"
+ fi
+ ],
+ [want_evas_simple_x11="no"])
+
+# Fontconfig
+AC_ARG_ENABLE([fontconfig],
+ [AC_HELP_STRING([--disable-fontconfig],
+ [disable fontconfig for finding fonts. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_fontconfig="yes"
+ else
+ want_fontconfig="no"
+ fi
+ ],
+ [want_fontconfig="yes"])
+
+# Fribidi
+AC_ARG_ENABLE([fribidi],
+ [AC_HELP_STRING([--disable-fribidi],
+ [disable bidirectional text support. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_fribidi="yes"
+ else
+ want_fribidi="no"
+ fi
+ ],
+ [want_fribidi="yes"])
+
+# Harfbuzz
+AC_ARG_ENABLE([harfbuzz],
+ [AC_HELP_STRING([--disable-harfbuzz],
+ [disable complex text shaping and layouting support. @<:@default=auto@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_harfbuzz="yes"
+ else
+ want_harfbuzz="no"
+ fi
+ ],
+ [want_harfbuzz="auto"])
+
+# Pixman
+AC_ARG_ENABLE([pixman],
+ [AC_HELP_STRING([--enable-pixman],
+ [enable pixman for software rendering. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_pixman="yes"
+ else
+ want_pixman="no"
+ fi
+ ],
+ [want_pixman="yes"])
+
+AC_ARG_ENABLE([pixman-font],
+ [AC_HELP_STRING([--enable-pixman-font],
+ [Allow pixman to render fonts. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_pixman_font="yes"
+ else
+ have_pixman_font="no"
+ fi
+ ],
+ [have_pixman_font="no"])
+
+AC_ARG_ENABLE([pixman-rect],
+ [AC_HELP_STRING([--enable-pixman-rect],
+ [Allow pixman to render rects. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_pixman_rect="yes"
+ else
+ have_pixman_rect="no"
+ fi
+ ],
+ [have_pixman_rect="no"])
+
+AC_ARG_ENABLE([pixman-line],
+ [AC_HELP_STRING([--enable-pixman-line],
+ [Allow pixman to render lines. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_pixman_line="yes"
+ else
+ have_pixman_line="no"
+ fi
+ ],
+ [have_pixman_line="no"])
+
+AC_ARG_ENABLE(pixman-poly,
+ AC_HELP_STRING([--enable-pixman-poly],
+ [Allow pixman to render polys. @<:@default=disabled@:>@]),
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_pixman_poly="yes"
+ else
+ have_pixman_poly="no"
+ fi
+ ],
+ [have_pixman_poly="no"])
+
+AC_ARG_ENABLE([pixman-image],
+ [AC_HELP_STRING([--enable-pixman-image],
+ [Allow pixman to render images. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_pixman_image="yes"
+ else
+ have_pixman_image="no"
+ fi
+ ],
+ [have_pixman_image="no"])
+
+AC_ARG_ENABLE([pixman-image-scale-sample],
+ [AC_HELP_STRING([--enable-pixman-image-scale-sample],
+ [Allow pixman to render sampled scaled images. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_pixman_image_scale_sample="yes"
+ else
+ have_pixman_image_scale_sample="no"
+ fi
+ ],
+ [have_pixman_image_scale_sample="no"])
+
+# Tile rotate
+AC_ARG_ENABLE([tile-rotate],
+ [AC_HELP_STRING([--enable-tile-rotate],
+ [Enable tiled rotate algorithm. @<:@default=disabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ have_tile_rotate="yes"
+ else
+ have_tile_rotate="no"
+ fi
+ ],
+ [have_tile_rotate="no"])
+
+# SSE3
+AC_ARG_ENABLE([cpu-sse3],
+ [AC_HELP_STRING([--enable-cpu-sse3],
+ [enable SSE3 code. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_sse3="yes"
+ else
+ want_sse3="no"
+ fi
+ ],
+ [want_sse3="yes"])
+
+# Engines
+
+AC_ARG_ENABLE([software-xcb],
+ AC_HELP_STRING([--enable-software-xcb], [enable Software XCB Engine. @<:@default=disabled@:>@]),
+ [
+ if test "x$enableval" = "xyes" ; then
+ want_xcb="yes"
+ else
+ want_xcb="no"
+ fi
+ ],
+ [want_xcb="no"])
+
+AC_ARG_ENABLE([gl-xcb],
+ AC_HELP_STRING([--enable-gl-xcb], [enable OpenGL XCB Engine. @<:@default=disabled@:>@]),
+ [
+ if test "x$enableval" = "xyes" ; then
+ want_gl_xcb="yes"
+ else
+ want_gl_xcb="no"
+ fi
+ ],
+ [want_gl_xcb="no"])
+
+AC_ARG_ENABLE([static-software-generic],
+ [AC_HELP_STRING([--enable-static-software-generic], [Build software generic engine as part of libevas. @<:@default=disabled@:>@])],
+ [
+ if test "x$enableval" = "xyes" ; then
+ have_static_software_generic="yes"
+ else
+ have_static_software_generic="no"
+ fi
+ ],
+ [have_static_software_generic="no"])
+
+AC_ARG_ENABLE([gl-flavor-gles],
+ [AC_HELP_STRING([--enable-gl-flavor-gles], [enable gles flavor of gl instead of standard. @<:@default=disabled@:>@])],
+ [
+ if test "x$enableval" = "xyes" ; then
+ gl_flavor_gles="yes"
+ else
+ gl_flavor_gles="no"
+ fi
+ ],
+ [gl_flavor_gles="no"])
+
+AC_ARG_ENABLE([sdl-primitive],
+ [AC_HELP_STRING([--enable-sdl-primitive], [enable SDL primitives. @<:@default=disabled@:>@])],
+ [
+ if test "x$enableval" = "xyes" ; then
+ sdl_primitive="yes"
+ else
+ sdl_primitive="no"
+ fi
+ ],
+ [sdl_primitive="no"])
+
+# Loaders
+
+AC_ARG_ENABLE([image-loader-gif],
+ [AC_HELP_STRING([--enable-image-loader-gif], [enable Gif image loader. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_evas_image_loader_gif="yes"
+ else
+ if test "x${enableval}" = "xstatic" ; then
+ want_evas_image_loader_gif="static"
+ else
+ want_evas_image_loader_gif="no"
+ fi
+ fi
+ ],
+ [want_evas_image_loader_gif="yes"])
+
+AC_ARG_ENABLE([image-loader-svg],
+ [AC_HELP_STRING([--enable-image-loader-svg], [enable SVG image loader. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_evas_image_loader_svg="yes"
+ else
+ if test "x${enableval}" = "xstatic" ; then
+ want_evas_image_loader_svg="static"
+ else
+ want_evas_image_loader_svg="no"
+ fi
+ fi
+ ],
+ [want_evas_image_loader_svg="yes"])
+
+AC_ARG_ENABLE([image-loader-tiff],
+ [AC_HELP_STRING([--enable-image-loader-tiff], [enable Tiff image loader. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_evas_image_loader_tiff="yes"
+ else
+ if test "x${enableval}" = "xstatic" ; then
+ want_evas_image_loader_tiff="static"
+ else
+ want_evas_image_loader_tiff="no"
+ fi
+ fi
+ ],
+ [want_evas_image_loader_tiff="yes"])
+
+AC_ARG_ENABLE([image-loader-webp],
+ [AC_HELP_STRING([--enable-image-loader-webp], [enable WEBP image loader. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_evas_image_loader_webp="yes"
+ else
+ if test "x${enableval}" = "xstatic" ; then
+ want_evas_image_loader_webp="static"
+ else
+ want_evas_image_loader_webp="no"
+ fi
+ fi
+ ],
+ [want_evas_image_loader_webp="yes"])
+
+### Default values
+
+want_evas_cserve2="yes"
+
+want_evas_engine_buffer="yes"
+want_evas_engine_software_xlib="no"
+want_evas_engine_software_xcb="no"
+want_evas_engine_software_gdi="no"
+want_evas_engine_software_ddraw="no"
+want_evas_engine_gl_xlib="no"
+want_evas_engine_gl_xcb="no"
+want_evas_engine_gl_sdl="no"
+want_evas_engine_gl_cocoa="no"
+want_evas_engine_direct3d="no"
+want_evas_engine_fb="no"
+want_evas_engine_directfb="no"
+want_evas_engine_psl1ght="no"
+want_evas_engine_wayland_shm="no"
+want_evas_engine_wayland_egl="no"
+
+want_evas_image_loader_bmp="static"
+want_evas_image_loader_eet="static"
+want_evas_image_loader_generic="static"
+#want_evas_image_loader_gif="yes"
+want_evas_image_loader_ico="static"
+want_evas_image_loader_jpeg="static"
+want_evas_image_loader_pmaps="static"
+want_evas_image_loader_png="static"
+want_evas_image_loader_psd="static"
+#want_evas_image_loader_svg="yes"
+want_evas_image_loader_tga="static"
+#want_evas_image_loader_tiff="yes"
+want_evas_image_loader_wbmp="static"
+#want_evas_image_loader_webp="yes"
+want_evas_image_loader_xpm="static"
+
+case "$host_os" in
+ mingw32ce*)
+ want_fontconfig="no"
+ want_evas_image_loader_gif="no"
+ want_evas_image_loader_svg="no"
+ want_evas_image_loader_tiff="no"
+ want_evas_image_loader_webp="no"
+ ;;
+ mingw*)
+ want_evas_engine_software_gdi="yes"
+ want_evas_engine_software_ddraw="yes"
+ want_evas_engine_direct3d="yes"
+ ;;
+ darwin*)
+ want_evas_engine_software_xlib="auto"
+ want_evas_engine_gl_cocoa="auto"
+ ;;
+ *)
+ want_evas_engine_software_xlib="auto"
+ want_evas_engine_gl_xlib="auto"
+ want_evas_engine_software_xcb="no"
+ want_evas_engine_gl_xcb="no"
+ want_evas_engine_fb="auto"
+ want_evas_engine_wayland_shm="auto"
+ want_evas_engine_wayland_egl="auto"
+ ;;
+esac
+
+EFL_CHECK_FUNC([DLSYM], [dlsym])
+requirements_libs_deps_evas="${requirements_libs_deps_evas} ${DLSYM_LIBS}"
+
+if test "x${efl_func_dlsym}" = "xno" ; then
+ want_evas_engine_gl_xlib="no"
+ want_evas_engine_gl_xcb="no"
+ want_evas_engine_gl_sdl="no"
+fi
+
+case "$host_vendor" in
+ ps3*)
+ want_evas_engine_psl1ght="static"
+ ;;
+esac
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+
+# Evil library for compilation on Windows
+
+case "$host_os" in
+ mingw*)
+ requirements_pc_evas="${requirements_pc_evas} evil >= ${PACKAGE_VERSION}"
+ ;;
+esac
+
+# Eina, Eo and Eet libraries
+
+requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_evas}"
+
+# Freetype
+PKG_CHECK_EXISTS([freetype2 >= 9.3.0],
+ [requirements_pc_evas="freetype2 >= 9.3.0 ${requirements_pc_evas}"])
+
+requirements_pc_deps_evas="freetype2 ${requirements_pc_deps_evas}"
+
+## optional dependencies
+
+# FontConfig
+have_fontconfig="no"
+if test "x${want_fontconfig}" = "xyes"; then
+ PKG_CHECK_EXISTS([fontconfig >= 2.5.0],
+ [
+ have_fontconfig="yes"
+ AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities])
+ requirements_pc_evas="fontconfig ${requirements_pc_evas}"
+ requirements_pc_deps_evas="fontconfig ${requirements_pc_deps_evas}"
+ ])
+fi
+
+# fribidi support
+have_fribidi="no"
+if test "x${want_fribidi}" = "xyes"; then
+ PKG_CHECK_EXISTS([fribidi >= 0.19.2],
+ [
+ have_fribidi="yes"
+ AC_DEFINE([HAVE_FRIBIDI], [1], [have fribidi support])
+ requirements_pc_evas="fribidi ${requirements_pc_evas}"
+ requirements_pc_deps_evas="fribidi ${requirements_pc_deps_evas}"
+ CPPFLAGS_SAVE="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS"
+ AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>])
+ CPPFLAGS="$CPPFLAGS_SAVE"
+ ])
+fi
+
+# harfbuzz support
+have_harfbuzz="no"
+have_harfbuzz_ft="no"
+if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
+ PKG_CHECK_EXISTS([harfbuzz >= 0.9.0],
+ [
+ have_harfbuzz="yes"
+ requirements_pc_evas="harfbuzz ${requirements_pc_evas}"
+ requirements_pc_deps_evas="harfbuzz ${requirements_pc_deps_evas}"
+ ],
+ [
+ if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
+ AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)])
+ fi
+ ])
+fi
+
+if test "x${have_harfbuzz}" = "xno"; then
+ HAS_HARFBUZZ=0
+fi
+
+# Pixman
+have_pixman="no"
+if test "x${want_pixman}" = "xyes" || test "x${want_pixman}" = "xauto" ; then
+ PKG_CHECK_EXISTS([pixman-1],
+ [
+ have_pixman="yes"
+ AC_DEFINE([HAVE_PIXMAN], [1], [have pixman for rendering])
+ requirements_pc_evas="pixman-1 ${requirements_pc_evas}"
+ requirements_pc_deps_evas="pixman-1 ${requirements_pc_deps_evas}"
+ ],
+ [
+ if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
+ AC_MSG_ERROR([Pixman not found (strict dependencies checking)])
+ fi
+ ])
+fi
+
+if test "x${have_pixman}" = "xyes" ; then
+ if test "x${have_pixman_font}" = "xyes" ; then
+ AC_DEFINE(PIXMAN_FONT, 1, [Allow pixman to render fonts])
+ fi
+ if test "x${have_pixman_rect}" = "xyes" ; then
+ AC_DEFINE(PIXMAN_RECT, 1, [Allow pixman to render rects])
+ fi
+ if test "x${have_pixman_line}" = "xyes" ; then
+ AC_DEFINE(PIXMAN_LINE, 1, [Allow pixman to render lines])
+ fi
+ if test "x${have_pixman_poly}" = "xyes" ; then
+ AC_DEFINE(PIXMAN_POLY, 1, [Allow pixman to render polys])
+ fi
+ if test "x${have_pixman_image}" = "xyes" ; then
+ AC_DEFINE(PIXMAN_IMAGE, 1, [Allow pixman to render images])
+ fi
+ if test "x${have_pixman_image_scale_sample}" = "xyes" ; then
+ AC_DEFINE(PIXMAN_IMAGE_SCALE_SAMPLE, 1, [Allow pixman to render image sampled scaling])
+ fi
+fi
+
+## Engines
+
+EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [yes], [Buffer])
+EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D])
+EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB])
+EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer])
+EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa])
+EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL])
+EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT])
+EVAS_CHECK_ENGINE([software-gdi], [${want_evas_engine_software_gdi}], [no], [Software GDI])
+EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw])
+EVAS_CHECK_ENGINE([wayland-shm], [${want_evas_engine_wayland_shm}], [no], [Wayland Shm])
+EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl])
+
+# Software XCB
+
+have_evas_engine_software_xcb="no"
+if test "x${want_xcb}" = "xyes" ; then
+ EVAS_CHECK_ENGINE([software-xcb], [${want_evas_engine_software_xcb}], [no], [Software XCB])
+else
+ AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XCB], [false])
+ AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XCB], [false])
+fi
+
+AC_MSG_CHECKING([whether to build Software XCB Engine])
+AC_MSG_RESULT([${have_evas_engine_software_xcb}])
+
+# No Software XCB ? Then try Software Xlib
+
+have_evas_engine_software_xlib="no"
+if test "x${have_evas_engine_software_xcb}" = "xno" ; then
+ EVAS_CHECK_ENGINE([software-xlib], [${want_evas_engine_software_xlib}], [no], [Software Xlib])
+else
+ AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false])
+ AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false])
+fi
+
+AC_MSG_CHECKING([whether to build Software Xlib Engine])
+AC_MSG_RESULT([${have_evas_engine_software_xlib}])
+
+# If software_x11 is available, define everything needed for X11
+
+have_evas_engine_software_x11="no"
+if test "x${have_evas_engine_software_xlib}" = "xyes" || test "x${have_evas_engine_software_xcb}" = "xyes" ; then
+ have_evas_engine_software_x11="yes"
+ AC_DEFINE_UNQUOTED([BUILD_ENGINE_SOFTWARE_X11], [1], [Build software X11 engine])
+fi
+AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [test "x${have_evas_engine_software_x11}" = "xyes"])
+
+if test "x${have_evas_engine_software_xlib}" = "xstatic" || test "x${have_evas_engine_software_xcb}" = "xstatic"; then
+ AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_SOFTWARE_X11], [1], [Build software X11 engine as part of libevas])
+fi
+AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [test "x${have_evas_engine_software_xcb}" = "xstatic" || test "x${have_evas_engine_software_xlib}" = "xstatic"])
+
+# Needed for evas-software-x11.pc
+
+AC_SUBST([have_evas_engine_software_xlib])
+AC_SUBST([have_evas_engine_software_xcb])
+
+# Software generic
+
+AC_MSG_CHECKING([Whether to build software generic engine as part of libevas])
+AC_MSG_RESULT([${have_static_software_generic}])
+
+if test "x${have_static_module}" = "xyes" && test "x${have_static_software_generic}" = "xno"; then
+ AC_MSG_WARN([Forcing --enable-static-software-generic as engines must be compiled statically])
+ have_static_software_generic="yes"
+fi
+
+if test "x${have_static_software_generic}" = "xyes"; then
+ AC_DEFINE([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [1], [Build software generic engine as part of libevas])
+fi
+
+AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [test "x${have_static_software_generic}" = "xyes"])
+
+# OpenGL
+
+AC_MSG_CHECKING([whether to build GLES flavor of GL])
+AC_MSG_RESULT([${gl_flavor_gles}])
+
+if test "x${gl_flavor_gles}" = "xyes" ; then
+ AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
+fi
+
+# OpenGL XCB
+
+have_evas_engine_gl_xcb="no"
+if test "x${want_gl_xcb}" = "xyes" ; then
+ EVAS_CHECK_ENGINE([gl-xcb], [${want_evas_engine_gl_xcb}], [no], [OpenGL XCB])
+else
+ AM_CONDITIONAL([BUILD_ENGINE_GL_XCB], [false])
+ AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XCB], [false])
+fi
+
+AC_MSG_CHECKING([whether to build OpenGL XCB Engine])
+AC_MSG_RESULT([${have_evas_engine_gl_xcb}])
+
+# No openGL XCB ? Then try OpenGL Xlib
+
+have_evas_engine_gl_xlib="no"
+if test "x${have_evas_engine_gl_xcb}" = "xno" ; then
+ EVAS_CHECK_ENGINE([gl-xlib], [${want_evas_engine_gl_xlib}], [no], [OpenGL XLib])
+else
+ AM_CONDITIONAL([BUILD_ENGINE_GL_XLIB], [false])
+ AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XLIB], [false])
+fi
+
+AC_MSG_CHECKING([whether to build OpenGL Xlib Engine])
+AC_MSG_RESULT([${have_evas_engine_gl_xlib}])
+
+# If opengl_x11 is available, define everything needed for X11
+
+have_evas_engine_gl_x11="no"
+if test "x${have_evas_engine_gl_xlib}" = "xyes" || test "x${have_evas_engine_gl_xcb}" = "xyes" ; then
+ have_evas_engine_gl_x11="yes"
+ AC_DEFINE_UNQUOTED([BUILD_ENGINE_GL_X11], [1], [Build OpenGL X11 engine])
+fi
+AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [test "x${have_evas_engine_gl_x11}" = "xyes"])
+
+if test "x${have_evas_engine_gl_xlib}" = "xstatic" || test "x${have_evas_engine_gl_xcb}" = "xstatic"; then
+ AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_GL_X11], [1], [Build OpenGL X11 engine as part of libevas])
+fi
+AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [test "x${have_evas_engine_gl_xcb}" = "xstatic" || test "x${have_evas_engine_gl_xlib}" = "xstatic"])
+
+# Needed for evas-opengl-x11.pc
+
+AC_SUBST([have_evas_engine_gl_xlib])
+AC_SUBST([have_evas_engine_gl_xcb])
+
+# OpenGL SDL
+
+if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then
+ AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION],
+ [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],,
+ [#include <SDL/SDL_video.h>])
+fi
+
+if test "x${gl_flavor_gles}" = "xyes"; then
+ AC_CHECK_DECL([SDL_OPENGLES],
+ [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is present])],,
+ [#include <SDL/SDL_video.h>])
+fi
+
+# OpenGL common
+evas_engine_gl_common_cflags=""
+evas_engine_gl_common_libs=""
+AC_SUBST([evas_engine_gl_common_cflags])
+AC_SUBST([evas_engine_gl_common_libs])
+
+have_evas_engine_gl_common="no"
+have_static_evas_engine_gl_common="no"
+if test "x$have_evas_engine_gl_xlib" = "xyes" || \
+ test "x$have_evas_engine_gl_xcb" = "xyes" || \
+ test "x$have_evas_engine_gl_sdl" = "xyes" || \
+ test "x$have_evas_engine_gl_cocoa" = "xyes" || \
+ test "x$have_evas_engine_wayland_egl" = "xyes"; then
+ have_evas_engine_gl_common="yes"
+fi
+if test "x$have_evas_engine_gl_xlib" = "xstatic" || \
+ test "x$have_evas_engine_gl_xcb" = "xstatic" || \
+ test "x$have_evas_engine_gl_sdl" = "xstatic" || \
+ test "x$have_evas_engine_gl_cocoa" = "xstatic" || \
+ test "x$have_evas_engine_wayland_egl" = "xstatic"; then
+ have_evas_engine_gl_common="yes"
+ have_static_evas_engine_gl_common="yes"
+fi
+
+if test "x${have_evas_engine_gl_common}" = "xyes"; then
+ AC_DEFINE([BUILD_ENGINE_GL_COMMON], [1], [Generic OpenGL Rendering Support])
+fi
+
+AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [test "x$have_evas_engine_gl_common" = "xyes"])
+
+if test "x${have_static_evas_engine_gl_common}" = "xyes"; then
+ AC_DEFINE([EVAS_STATIC_BUILD_GL_COMMON], [1], [Build GL generic engine as part of libevas])
+fi
+
+AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test "x${have_static_evas_engine_gl_common}" = "xyes"])
+
+# SDL
+
+AC_MSG_CHECKING([whether to use SDL primitive when possible])
+AC_MSG_RESULT([${sdl_primitive}])
+
+if test "x${sdl_primitive}" = "xyes" ; then
+ AC_DEFINE([ENGINE_SDL_PRIMITIVE], [1], [Use SDL primitive when possible])
+fi
+
+## Image Loaders
+
+EVAS_CHECK_IMAGE_LOADER([BMP], [${want_evas_image_loader_bmp}])
+EVAS_CHECK_IMAGE_LOADER([Eet], [${want_evas_image_loader_eet}])
+EVAS_CHECK_IMAGE_LOADER([Generic], [${want_evas_image_loader_generic}])
+EVAS_CHECK_IMAGE_LOADER([Gif], [${want_evas_image_loader_gif}])
+EVAS_CHECK_IMAGE_LOADER([ICO], [${want_evas_image_loader_ico}])
+EVAS_CHECK_IMAGE_LOADER([JPEG], [${want_evas_image_loader_jpeg}])
+EVAS_CHECK_IMAGE_LOADER([PMAPS], [${want_evas_image_loader_pmaps}])
+EVAS_CHECK_IMAGE_LOADER([PNG], [${want_evas_image_loader_png}])
+EVAS_CHECK_IMAGE_LOADER([PSD], [${want_evas_image_loader_psd}])
+EVAS_CHECK_IMAGE_LOADER([SVG], [${want_evas_image_loader_svg}])
+EVAS_CHECK_IMAGE_LOADER([Tga], [${want_evas_image_loader_tga}])
+EVAS_CHECK_IMAGE_LOADER([Tiff], [${want_evas_image_loader_tiff}])
+EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}])
+EVAS_CHECK_IMAGE_LOADER([WEBP], [${want_evas_image_loader_webp}])
+EVAS_CHECK_IMAGE_LOADER([XPM], [${want_evas_image_loader_xpm}])
+
+dnl Windows has no sigsetjmp function, nor equivalent.
+dnl So we disable the jpeg saver.
+dnl TODO: must find a workaround
+case "$host_os" in
+ mingw*)
+ ;;
+ *)
+ if test "x${have_evas_image_loader_jpeg}" = "xyes" ; then
+ AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver])
+ have_evas_image_saver_jpeg="yes"
+ fi
+ ;;
+esac
+
+AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"])
+
+PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}])
+
+EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_deps_evas}"
+
+### Checks for header files
+
+if test "x$have_harfbuzz" = "xyes" ; then
+
+ CPPFLAGS_SAVE="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS"
+# must have for usage with harfbuzz although harfbuzz may not have it.
+
+ AC_CHECK_HEADER([hb-ft.h],
+ [
+ have_harfbuzz_ft="yes"
+ #Depend on harfbuzz ft for harfbuzz support
+ AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support])
+ ],
+ [
+ if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
+ AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)])
+ fi
+ have_harfbuzz="no"
+ ])
+ CPPFLAGS="$CPPFLAGS_SAVE"
+fi
+
+### Checks for types
+
+CPPFLAGS_SAVE="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -Isrc/lib/eina"
+AC_CHECK_SIZEOF([Eina_Unicode], [], [#include <Eina.h>])
+CPPFLAGS="$CPPFLAGS_SAVE"
+
+### Checks for structures
+
+AC_CHECK_TYPES([struct sigaction], [], [],
+ [[#include <signal.h>]])
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+AC_CHECK_FUNCS([siglongjmp])
+
+res=no
+AC_CHECK_LIB([m], [lround], [res=yes], [res=no])
+if test "x${res}" = "xyes" ; then
+ AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists])
+fi
+
+if test "x${want_evas_image_loader_generic}" = "xyes" || test "x${want_evas_cserve2}" = "xyes" ; then
+ EFL_CHECK_FUNC([EVAS], [shm_open])
+fi
+
+# cserve2 only works on Linux so far.
+
+if test "x${efl_func_shm_open}" = "xno" ; then
+ want_evas_cserve2="no"
+fi
+
+if test "x${want_evas_cserve2}" = "xyes" ; then
+ AC_CHECK_HEADERS([sys/epoll.h sys/inotify.h sys/signalfd.h],
+ [],
+ [want_evas_cserve2="no"])
+fi
+
+if test "x${want_evas_cserve2}" = "xyes" ; then
+ AC_DEFINE([EVAS_CSERVE2], [1], [Shared cache server.])
+fi
+AM_CONDITIONAL([EVAS_CSERVE2], [test "x${want_evas_cserve2}" = "xyes"])
+
+### Configuration
+
+## Tile rotation
+
+if test "x${have_tile_rotate}" = "xyes" ; then
+ AC_DEFINE(TILE_ROTATE, 1, [Enable tiled rotate algorithm])
+fi
+
+## CPU architecture specific assembly
+
+build_cpu_mmx="no"
+build_cpu_sse3="no"
+build_cpu_altivec="no"
+build_cpu_neon="no"
+
+case $host_cpu in
+ i*86|x86_64|amd64)
+ AC_DEFINE([BUILD_MMX], [1], [Build MMX Code])
+ build_cpu_mmx="yes"
+ build_cpu_sse3="yes"
+ ;;
+ *power* | *ppc*)
+ build_cpu_altivec="yes"
+ AC_CHECK_HEADER([altivec.h],
+ [
+ AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+ AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file])
+ build_cpu_altivec="yes"
+ ],
+ [
+ save_CFLAGS=$CFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CFLAGS=$CFLAGS" -maltivec"
+ CPPFLAGS=$CPPFLAGS" -maltivec"
+ unset ac_cv_header_altivec_h
+ AC_CHECK_HEADER([altivec.h],
+ [
+ AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+ AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file])
+ build_cpu_altivec="yes"
+ ],
+ [build_cpu_altivec="no"]
+ )
+ CFLAGS=$save_CFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ ]
+ )
+ if test "x${build_cpu_altivec}" = "xyes"; then
+ AC_MSG_CHECKING([whether to use altivec compiler flag])
+ if test "x$GCC" = "xyes"; then
+ if echo "int main(){return 0;}" | ${CPP} -faltivec - > /dev/null 2>&1; then
+ altivec_cflags="-faltivec"
+ AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+ elif echo "int main(){return 0;}" | ${CPP} -maltivec - > /dev/null 2>&1; then
+ altivec_cflags="-maltivec"
+ AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
+ fi
+ fi
+ AC_MSG_RESULT([${altivec_cflags}])
+ CFLAGS="$CFLAGS ${altivec_cflags}"
+ fi
+ ;;
+ arm*)
+ build_cpu_neon="yes"
+ AC_MSG_CHECKING([whether to use NEON instructions])
+ AC_TRY_COMPILE([#include <arm_neon.h>],
+ [asm volatile ("vqadd.u8 d0, d1, d0\n")],
+ [
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([BUILD_NEON], [1], [Build NEON Code])
+ build_cpu_neon="yes"
+ ],
+ [
+ AC_MSG_RESULT([no])
+ build_cpu_neon="no"
+ ])
+ ;;
+esac
+
+AC_SUBST([altivec_cflags])
+
+# SSE3
+
+if test "x${want_sse3}" = "xyes" && test "x${build_cpu_sse3}" = "xyes" ; then
+ AC_CHECK_HEADER([immintrin.h],
+ [AC_DEFINE(BUILD_SSE3, 1, [Build SSE3 Code])],
+ [build_cpu_sse3="no"])
+else
+ build_cpu_sse3="no"
+fi
+
+AC_MSG_CHECKING([whether to build sse3 code])
+AC_MSG_RESULT([${build_cpu_sse3}])
+
+EVAS_SSE3_CFLAGS=" "
+EVAS_ALTIVEC_CFLAGS=" "
+
+if test "x$build_cpu_sse3" = "xyes" ; then
+ EVAS_SSE3_CFLAGS="-msse3"
+fi
+if test "x$build_cpu_altivec" = "xyes" ; then
+ EVAS_ALTIVEC_CFLAGS="-maltivec"
+fi
+
+AC_SUBST([CFLAGS])
+AC_SUBST([EVAS_ALTIVEC_CFLAGS])
+AC_SUBST([EVAS_SSE3_CFLAGS])
+
+## dither options
+
+# Small dither mask instead of big one (lower quality)
+EVAS_CHECK_DITHER([small-dither-mask], [small dither mask], [conv_small_dither="yes"], [conv_small_dither="no"])
+# Alternate Line dither mask instead of big one (lower quality - but fastest)
+EVAS_CHECK_DITHER([line-dither-mask], [line dither mask], [conv_line_dither="yes"], [conv_line_dither="no"])
+# No dither mask at all for 16bpp
+EVAS_CHECK_DITHER([no-dither-mask], [conversion to 16bpp without dither mask], [conv_no_dither="yes"], [conv_no_dither="no"])
+
+#### End of Evas
+
+
#### Embryo
AC_MSG_NOTICE([Embryo checks])
@@ -887,8 +1825,6 @@ src/examples/eina/Makefile
src/examples/eet/Makefile
src/examples/eo/Makefile
src/lib/eina/eina_config.h
-src/scripts/Makefile
-src/scripts/eina/Makefile
src/tests/Makefile
src/tests/eina/Makefile
src/tests/eet/Makefile
@@ -899,6 +1835,21 @@ pc/eina.pc
pc/eet.pc
pc/eo.pc
pc/embryo.pc
+pc/evas-direct3d.pc
+pc/evas-directfb.pc
+pc/evas-fb.pc
+pc/evas-opengl-x11.pc
+pc/evas-opengl-sdl.pc
+pc/evas-opengl-cocoa.pc
+pc/evas-psl1ght.pc
+pc/evas-software-buffer.pc
+pc/evas-software-x11.pc
+pc/evas-software-gdi.pc
+pc/evas-software-ddraw.pc
+pc/evas-software-sdl.pc
+pc/evas-wayland-shm.pc
+pc/evas-wayland-egl.pc
+pc/evas.pc
])
AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 6ab1f988a..e3dc4c262 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,9 @@
MAINTAINERCLEANFILES = Makefile.in
-filesdir = $(datadir)/embryo/include
-files_DATA = embryo/default.inc
+embryofilesdir = $(datadir)/embryo/include
+embryofiles_DATA = embryo/default.inc
-EXTRA_DIST = $(files_DATA)
+evasfilesdir = $(datadir)/evas
+evasfiles_DATA = evas/checkme
+
+EXTRA_DIST = embryo/default.inc evas/checkme
diff --git a/legacy/evas/data/checkme b/data/evas/checkme
index 987063d4c..987063d4c 100644
--- a/legacy/evas/data/checkme
+++ b/data/evas/checkme
diff --git a/m4/efl_attribute.m4 b/m4/efl_attribute.m4
index cd42e9cda..4f31d9317 100644
--- a/m4/efl_attribute.m4
+++ b/m4/efl_attribute.m4
@@ -29,4 +29,55 @@ if test "x${have_attribute_vector}" = "xyes" ; then
fi
])
+dnl Usage: EFL_ATTRIBUTE_ALWAYS_INLINE
+dnl call AC_DEFINE for alway_inline if __attribute__((always_inline)) is available
+
+AC_DEFUN([EFL_ATTRIBUTE_ALWAYS_INLINE],
+[
+
+have_attribute_forceinline="no"
+
+AC_MSG_CHECKING([for __forceinline])
+
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <windows.h>
+static __forceinline void foo(void) {}
+ ]],
+ [[
+ ]])],
+ [
+ have_attribute_always_inline="yes"
+ have_attribute_forceinline="yes"
+ ],
+ [have_attribute_always_inline="no"])
+
+AC_MSG_RESULT([${have_attribute_always_inline}])
+
+if test "x${have_attribute_always_inline}" = "xno" ; then
+ AC_MSG_CHECKING([for __attribute__ ((__always_inline__))])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+static __attribute__((__always_inline__)) inline void foo(void) {}
+ ]],
+ [[
+ ]])],
+ [have_attribute_always_inline="yes"],
+ [have_attribute_always_inline="no"])
+ AC_MSG_RESULT([${have_attribute_always_inline}])
+fi
+
+if test "x${have_attribute_always_inline}" = "xyes" ; then
+ if test "x${have_attribute_forceinline}" = "xyes" ; then
+ AC_DEFINE([EFL_ALWAYS_INLINE], [__forceinline], [Macro declaring a function to always be inlined.])
+ else
+ AC_DEFINE([EFL_ALWAYS_INLINE], [__attribute__ ((__always_inline__)) inline], [Macro declaring a function to always be inlined.])
+ fi
+else
+ AC_DEFINE([EFL_ALWAYS_INLINE], [static inline], [Macro declaring a function to always be inlined.])
+fi
+])
+
dnl End of efl_attribute.m4
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
index 23712bcdd..109ad067d 100644
--- a/m4/efl_check_funcs.m4
+++ b/m4/efl_check_funcs.m4
@@ -53,11 +53,14 @@ LIBS="${LIBS} $2"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#include <stdlib>
#include <dlfcn.h>
]],
[[
-int res = dladdr(0, 0);
+int res = dladdr(NULL, NULL);
]])],
[
m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2"
@@ -171,6 +174,75 @@ m4_popdef([DOWNEFL])
m4_popdef([UPEFL])
])
+dnl _EFL_CHECK_FUNC_DLSYM_PRIV is for internal use
+dnl _EFL_CHECK_FUNC_DLSYM_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+
+AC_DEFUN([_EFL_CHECK_FUNC_DLSYM_PRIV],
+[
+m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+LIBS_save="${LIBS}"
+LIBS="${LIBS} $2"
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+#include <stdlib.h>
+#include <dlfcn.h>
+ ]],
+ [[
+void *res = dlsym(NULL, NULL);
+ ]])],
+ [
+ m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2"
+ requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2"
+ _efl_have_fct="yes"
+ ],
+ [_efl_have_fct="no"])
+
+LIBS="${LIBS_save}"
+
+AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4])
+
+m4_popdef([DOWNEFL])
+m4_popdef([UPEFL])
+])
+
+dnl _EFL_CHECK_FUNC_DLSYM is for internal use
+dnl _EFL_CHECK_FUNC_DLSYM(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+
+AC_DEFUN([_EFL_CHECK_FUNC_DLSYM],
+[
+m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+case "$host_os" in
+ mingw*)
+ _efl_have_fct="yes"
+ requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl"
+ ;;
+ *)
+ _efl_have_fct="no"
+
+dnl Check is dlsym is in libc
+ _EFL_CHECK_FUNC_DLSYM_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"])
+
+dnl Check is dlopen is in libdl
+ if test "x${_efl_have_fct}" = "xno" ; then
+ _EFL_CHECK_FUNC_DLSYM_PRIV([$1], [-ldl], [_efl_have_fct="yes"], [_efl_have_fct="no"])
+ fi
+ ;;
+esac
+
+AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3])
+
+m4_popdef([DOWNEFL])
+m4_popdef([UPEFL])
+])
+
dnl _EFL_CHECK_FUNC_FNMATCH_PRIV is for internal use
dnl _EFL_CHECK_FUNC_FNMATCH_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
diff --git a/m4/eina_config.m4 b/m4/eina_config.m4
index 3a0e50b52..609e4f9c7 100644
--- a/m4/eina_config.m4
+++ b/m4/eina_config.m4
@@ -4,5 +4,5 @@ AC_DEFUN([EINA_CONFIG],
if $2; then
EINA_CONFIGURE_$1="#define EINA_$1"
fi
-AC_SUBST(EINA_CONFIGURE_$1)
+AC_SUBST([EINA_CONFIGURE_$1])
])
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index f79634db4..78c4acccd 100644
--- a/legacy/evas/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -53,6 +53,11 @@ if test "x${have_dep}" = "xyes" ; then
evas_engine_[]$1[]_libs="${x_libs}"
fi
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
+
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -123,15 +128,15 @@ if test "x${have_dep}" = "xyes" ; then
fi
if test "x${have_dep}" = "xyes" ; then
- AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib)
+ AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib])
fi
-if test "x$gl_flavor_gles" = "xyes" ; then
+if test "x${gl_flavor_gles}" = "xyes" ; then
have_dep=no
fi
if test "x${have_dep}" = "xyes" ; then
- PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
+ PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xyes" ; then
x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -168,7 +173,7 @@ else
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
- PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
+ PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
evas_engine_[]$1[]_cflags="${x_cflags}"
evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
@@ -181,6 +186,11 @@ else
fi
fi
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
+
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -208,20 +218,20 @@ PKG_CHECK_MODULES([XCB],
[
have_dep="yes"
requirement="xcb xcb-shm xcb-image pixman-1"
- evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
- evas_engine_[]$1[]_libs="${XCB_LIBS}"
- ],[
- have_dep="no"
- ]
-)
+ ],
+ [have_dep="no"])
-AC_SUBST([evas_engine_$1_cflags])
-AC_SUBST([evas_engine_$1_libs])
+evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
+evas_engine_[]$1[]_libs="${XCB_LIBS}"
-if test "x$3" = "xstatic" ; then
- requirement_evas="${requirement} ${requirement_evas}"
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
fi
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
@@ -236,6 +246,8 @@ dnl use: EVAS_CHECK_ENGINE_DEP_GL_XCB(engine, simple, want_static[, ACTION-IF-FO
AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
[
+requirement=""
+have_dep="no"
evas_engine_[]$1[]_cflags=""
evas_engine_[]$1[]_libs=""
@@ -293,19 +305,18 @@ PKG_CHECK_MODULES([XCB_GL],
[
have_dep="yes"
requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
- evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
- evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
- ],[
- have_dep="no"
- ]
-)
+ ],
+ [have_dep="no"])
+
+evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
+evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
if test "x$gl_flavor_gles" = "xyes" ; then
have_dep=no
fi
if test "x${have_dep}" = "xyes" ; then
- PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
+ PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
if test "x$2" = "xyes" ; then
x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -337,7 +348,7 @@ else
if test "x${have_egl}" = "xyes" ; then
AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
if test "x${have_glesv2}" = "xyes" ; then
- PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
+ PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
if test "x${have_dep}" = "xyes" ; then
evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
@@ -350,6 +361,13 @@ else
fi
fi
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+fi
+
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -375,8 +393,12 @@ AC_CHECK_HEADER([windows.h],
[
have_dep="yes"
evas_engine_[]$1[]_libs="-lgdi32"
- ]
-)
+ ])
+
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -402,8 +424,12 @@ AC_CHECK_HEADER([ddraw.h],
[
have_dep="yes"
evas_engine_[]$1[]_libs="-lddraw"
- ]
-)
+ ])
+
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -429,8 +455,12 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h],
have_dep="yes"
evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9 -lgdi32"
],
- [have_dep="no"; break]
-)
+ [have_dep="no"; break])
+
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -481,7 +511,12 @@ LIBS="$LIBS_save"
AC_LANG_POP([Objective C])
if test "x${have_dep}" = "xyes" ; then
- PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
+ PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
+fi
+
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
fi
AC_SUBST([evas_engine_$1_cflags])
@@ -510,10 +545,10 @@ PKG_CHECK_MODULES([SDL],
[
have_dep="yes"
requirement="sdl"
- evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
- evas_engine_[]$1[]_libs="${SDL_LIBS}"
- ]
-)
+ ])
+
+evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
+evas_engine_[]$1[]_libs="${SDL_LIBS}"
gl_pt_lib="";
have_gl_pt="no"
@@ -577,6 +612,13 @@ else
fi
fi
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+fi
+
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
@@ -631,52 +673,16 @@ PKG_CHECK_MODULES([DIRECTFB],
requirement="directfb"
evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}"
- ]
-)
-
-AC_SUBST([evas_engine_$1_cflags])
-AC_SUBST([evas_engine_$1_libs])
-
-if test "x$3" = "xstatic" ; then
- requirement_evas="${requirement} ${requirement_evas}"
-fi
+ ])
-if test "x${have_dep}" = "xyes" ; then
- m4_default([$4], [:])
-else
- m4_default([$5], [:])
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
fi
-])
-
-dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-
-AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11],
-[
-
-have_dep="no"
-evas_engine_[]$1[]_cflags=""
-evas_engine_[]$1[]_libs=""
-
-PKG_CHECK_MODULES([XCB],
- [xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
- [
- have_dep="yes"
- requirement="xcb xcb-shm xcb-image pixman-1"
- evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
- evas_engine_[]$1[]_libs="${XCB_LIBS}"
- ],[
- have_dep="no"
- ]
-)
-
AC_SUBST([evas_engine_$1_cflags])
AC_SUBST([evas_engine_$1_libs])
-if test "x$3" = "xstatic" ; then
- requirement_evas="${requirement} ${requirement_evas}"
-fi
-
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
@@ -745,27 +751,27 @@ else
gl_library="gl"
fi
-PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"])
+PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
PKG_CHECK_MODULES([WAYLAND_EGL],
[egl >= 7.10 ${gl_library} wayland-client wayland-egl],
[
have_dep="yes"
- requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl"
- evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
- evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
- ],[
- have_dep="no"
- ]
-)
+ requirement="egl ${gl_library} wayland-client wayland-egl"
+ ],
+ [have_dep="no"])
-AC_SUBST([evas_engine_$1_cflags])
-AC_SUBST([evas_engine_$1_libs])
+evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
+evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
-if test "x$3" = "xstatic" ; then
- requirement_evas="${requirement} ${requirement_evas}"
+if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
fi
+AC_SUBST([evas_engine_$1_cflags])
+AC_SUBST([evas_engine_$1_libs])
+
if test "x${have_dep}" = "xyes" ; then
m4_default([$4], [:])
else
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
new file mode 100644
index 000000000..1b0831dce
--- /dev/null
+++ b/m4/evas_check_loader.m4
@@ -0,0 +1,534 @@
+
+dnl use: EVAS_CHECK_LOADER_DEP_BMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_BMP],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_EET],
+[
+
+requirement=""
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+PKG_CHECK_MODULES([EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes" requirement="eet >= ${PACKAGE_VERSION}"], [have_dep="no"])
+evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}"
+evas_image_loader_[]$1[]_libs="${EET_LIBS}"
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirements_pc_deps_evas}"
+fi
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_GENERIC(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_GENERIC],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_GIF],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([gif_lib.h], [have_dep="yes"])
+
+if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([gif],
+ [DGifOpenFileName],
+ [
+ evas_image_loader_[]$1[]_libs="-lgif"
+ ],
+ [have_dep="no"]
+ )
+
+ if test "x${have_dep}" = "xno" ; then
+ AC_CHECK_LIB([ungif],
+ [DGifOpenFileName],
+ [
+ have_dep="yes"
+ evas_image_loader_[]$1[]_libs="-lungif"
+ ]
+ )
+ fi
+fi
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_ICO(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_ICO],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_JPEG],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([jpeglib.h], [have_dep="yes"])
+
+if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([jpeg],
+ [jpeg_CreateDecompress],
+ [
+ evas_image_loader_[]$1[]_libs="-ljpeg"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+#include <stdio.h>
+#include <jpeglib.h>
+#include <setjmp.h>
+ ]],
+ [[
+struct jpeg_decompress_struct decomp;
+decomp.region_x = 0;
+ ]])],
+ [have_jpeg_region="yes"],
+ [have_jpeg_region="no"])
+ ],
+ [have_dep="no"]
+ )
+ if test "x${have_jpeg_region}" = "xyes" ; then
+ AC_DEFINE(BUILD_LOADER_JPEG_REGION, [1], [JPEG Region Decode Support])
+ fi
+fi
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader, want_static[[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_PMAPS],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
+[
+
+requirement=""
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+dnl libpng.pc is the latest version of libpng that ahs been installed.
+dnl We check it first.
+PKG_CHECK_MODULES([PNG],
+ [libpng >= 1.2.10],
+ [have_dep="yes" requirement="libpng"],
+ [have_dep="no"])
+
+if test "x${have_dep}" = "xno" ; then
+ PKG_CHECK_MODULES([PNG],
+ [libpng15],
+ [have_dep="yes" requirement="libpng15"],
+ [have_dep="no"])
+fi
+
+if test "x${have_dep}" = "xno" ; then
+ PKG_CHECK_MODULES([PNG],
+ [libpng14],
+ [have_dep="yes" requirement="libpng14"],
+ [have_dep="no"])
+fi
+
+if test "x${have_dep}" = "xno" ; then
+ PKG_CHECK_MODULES([PNG],
+ [libpng12 >= 1.2.10],
+ [have_dep="yes" requirement="libpng12"],
+ [have_dep="no"])
+fi
+
+evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
+evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+fi
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_PSD(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_PSD],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
+[
+
+requirement=""
+have_esvg="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+version_esvg="0.0.18"
+version_ender="0.0.6"
+
+PKG_CHECK_MODULES([SVG],
+ [esvg >= ${version_esvg} ender >= ${version_ender}],
+ [have_dep="yes" have_esvg="yes" requirement="esvg >= ${version_esvg} ender >= ${version_ender}"],
+ [have_dep="no"])
+
+if test "x${have_dep}" = "xyes" ; then
+ evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
+ evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_pc_evas="${requirement} ${requirements_pc_evas}"
+ requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
+fi
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_TGA(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGA],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_TIFF],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([tiffio.h], [have_dep="yes"])
+
+if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([tiff],
+ [TIFFReadScanline],
+ [
+ evas_image_loader_[]$1[]_libs="-ltiff"
+ ],
+ [have_dep="no"]
+ )
+
+ if test "x${have_dep}" = "xno" ; then
+ AC_CHECK_LIB([tiff],
+ [TIFFReadScanline],
+ [
+ have_dep="yes"
+ evas_image_loader_[]$1[]_libs="-ltiff -ljpeg -lz -lm"
+ ]
+ )
+ fi
+
+ if test "x${have_dep}" = "xno" ; then
+ AC_CHECK_LIB([tiff34],
+ [TIFFReadScanline],
+ [
+ have_dep="yes"
+ evas_image_loader_[]$1[]_libs="-ltiff34 -ljpeg -lz -lm"
+ ]
+ )
+ fi
+fi
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_WBMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_WBMP],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_WEBP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_WEBP],
+[
+
+have_dep="no"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_CHECK_HEADER([webp/decode.h], [have_dep="yes"])
+
+if test "x${have_dep}" = "xyes" ; then
+ AC_CHECK_LIB([webp],
+ [WebPDecodeRGBA],
+ [
+ evas_image_loader_[]$1[]_libs="-lwebp"
+ ],
+ [have_dep="no"]
+ )
+fi
+
+if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
+ requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
+ requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
+fi
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([EVAS_CHECK_LOADER_DEP_XPM],
+[
+
+have_dep="yes"
+evas_image_loader_[]$1[]_cflags=""
+evas_image_loader_[]$1[]_libs=""
+
+AC_SUBST([evas_image_loader_$1_cflags])
+AC_SUBST([evas_image_loader_$1_libs])
+
+if test "x${have_dep}" = "xyes" ; then
+ m4_default([$3], [:])
+else
+ m4_default([$4], [:])
+fi
+
+])
+
+dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro)
+
+
+AC_DEFUN([EVAS_CHECK_IMAGE_LOADER],
+[
+
+m4_pushdef([UP], m4_toupper([$1]))
+m4_pushdef([DOWN], m4_tolower([$1]))
+
+want_loader="$2"
+want_static_loader="no"
+have_loader="no"
+have_evas_image_loader_[]DOWN="no"
+
+AC_MSG_CHECKING([whether to enable $1 image loader])
+AC_MSG_RESULT([${want_loader}])
+
+if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
+ m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"])
+fi
+
+if test "x${have_loader}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then
+ AC_MSG_ERROR([$1 dependencies not found (strict dependencies checking)])
+fi
+
+AC_MSG_CHECKING([whether $1 image loader will be built])
+AC_MSG_RESULT([${have_loader}])
+
+if test "x${have_loader}" = "xyes" ; then
+ if test "x${want_loader}" = "xstatic" ; then
+ have_evas_image_loader_[]DOWN="static"
+ want_static_loader="yes"
+ else
+ have_evas_image_loader_[]DOWN="yes"
+ fi
+fi
+
+if test "x${have_loader}" = "xyes" ; then
+ AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support])
+fi
+
+AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_loader}" = "xyes"])
+
+if test "x${want_static_loader}" = "xyes" ; then
+ AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 image loader inside libevas])
+ have_static_module="yes"
+fi
+
+AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"])
+
+m4_popdef([UP])
+m4_popdef([DOWN])
+
+])
diff --git a/legacy/evas/m4/evas_dither.m4 b/m4/evas_dither.m4
index f8dcca3b7..f8dcca3b7 100644
--- a/legacy/evas/m4/evas_dither.m4
+++ b/m4/evas_dither.m4
diff --git a/legacy/evas/ChangeLog b/old/ChangeLog.evas
index 3bc62e3d2..3bc62e3d2 100644
--- a/legacy/evas/ChangeLog
+++ b/old/ChangeLog.evas
diff --git a/legacy/evas/NEWS b/old/NEWS.evas
index 3271bbe90..3271bbe90 100644
--- a/legacy/evas/NEWS
+++ b/old/NEWS.evas
diff --git a/legacy/evas/README b/old/README.evas
index a881811c0..a881811c0 100644
--- a/legacy/evas/README
+++ b/old/README.evas
diff --git a/legacy/evas/evas-direct3d.pc.in b/pc/evas-direct3d.pc.in
index 493f8cce0..493f8cce0 100644
--- a/legacy/evas/evas-direct3d.pc.in
+++ b/pc/evas-direct3d.pc.in
diff --git a/legacy/evas/evas-directfb.pc.in b/pc/evas-directfb.pc.in
index 9a1bc3aba..9a1bc3aba 100644
--- a/legacy/evas/evas-directfb.pc.in
+++ b/pc/evas-directfb.pc.in
diff --git a/legacy/evas/evas-fb.pc.in b/pc/evas-fb.pc.in
index 0e1f0a08e..0e1f0a08e 100644
--- a/legacy/evas/evas-fb.pc.in
+++ b/pc/evas-fb.pc.in
diff --git a/legacy/evas/evas-opengl-cocoa.pc.in b/pc/evas-opengl-cocoa.pc.in
index d908e0bdd..d908e0bdd 100644
--- a/legacy/evas/evas-opengl-cocoa.pc.in
+++ b/pc/evas-opengl-cocoa.pc.in
diff --git a/legacy/evas/evas-opengl-sdl.pc.in b/pc/evas-opengl-sdl.pc.in
index 64c17b352..64c17b352 100644
--- a/legacy/evas/evas-opengl-sdl.pc.in
+++ b/pc/evas-opengl-sdl.pc.in
diff --git a/legacy/evas/evas-opengl-x11.pc.in b/pc/evas-opengl-x11.pc.in
index 2cb1ec264..2cb1ec264 100644
--- a/legacy/evas/evas-opengl-x11.pc.in
+++ b/pc/evas-opengl-x11.pc.in
diff --git a/legacy/evas/evas-psl1ght.pc.in b/pc/evas-psl1ght.pc.in
index ba17d58c7..ba17d58c7 100644
--- a/legacy/evas/evas-psl1ght.pc.in
+++ b/pc/evas-psl1ght.pc.in
diff --git a/legacy/evas/evas-software-buffer.pc.in b/pc/evas-software-buffer.pc.in
index da5d79845..da5d79845 100644
--- a/legacy/evas/evas-software-buffer.pc.in
+++ b/pc/evas-software-buffer.pc.in
diff --git a/legacy/evas/evas-software-ddraw.pc.in b/pc/evas-software-ddraw.pc.in
index de4b6d2af..de4b6d2af 100644
--- a/legacy/evas/evas-software-ddraw.pc.in
+++ b/pc/evas-software-ddraw.pc.in
diff --git a/legacy/evas/evas-software-gdi.pc.in b/pc/evas-software-gdi.pc.in
index 097c4e1e8..097c4e1e8 100644
--- a/legacy/evas/evas-software-gdi.pc.in
+++ b/pc/evas-software-gdi.pc.in
diff --git a/legacy/evas/evas-software-sdl.pc.in b/pc/evas-software-sdl.pc.in
index fb1972479..fb1972479 100644
--- a/legacy/evas/evas-software-sdl.pc.in
+++ b/pc/evas-software-sdl.pc.in
diff --git a/legacy/evas/evas-software-x11.pc.in b/pc/evas-software-x11.pc.in
index b32556c7d..b32556c7d 100644
--- a/legacy/evas/evas-software-x11.pc.in
+++ b/pc/evas-software-x11.pc.in
diff --git a/legacy/evas/evas-wayland-egl.pc.in b/pc/evas-wayland-egl.pc.in
index a770c42ae..a770c42ae 100644
--- a/legacy/evas/evas-wayland-egl.pc.in
+++ b/pc/evas-wayland-egl.pc.in
diff --git a/legacy/evas/evas-wayland-shm.pc.in b/pc/evas-wayland-shm.pc.in
index 5576681b1..5576681b1 100644
--- a/legacy/evas/evas-wayland-shm.pc.in
+++ b/pc/evas-wayland-shm.pc.in
diff --git a/legacy/evas/evas.pc.in b/pc/evas.pc.in
index f5c514a86..6c852b5cc 100644
--- a/legacy/evas/evas.pc.in
+++ b/pc/evas.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
Name: evas
Description: Evas canvas display library
-@pkgconfig_requires_private@: @requirement_evas@
+Requires.private: @requirements_pc_evas@
Version: @VERSION@
-Libs: -L${libdir} -levas @EINA_LIBS@ @shm_open_libs@
-Libs.private: @EFL_FNMATCH_LIBS@ @pthread_libs@ @shm_open_libs@
+Libs: -L${libdir} -levas
+Libs.private: @requirements_libs_evas@
Cflags: -I${includedir}/evas-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index b0fc8b5da..930d4aebe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = . scripts benchmarks tests examples
+SUBDIRS = . benchmarks tests examples
lib_LTLIBRARIES =
bin_PROGRAMS =
@@ -15,6 +15,7 @@ endif
include Makefile_Eina.am
include Makefile_Eo.am
include Makefile_Eet.am
+include Makefile_Evas.am
include Makefile_Embryo.am
.PHONY: benchmark examples
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 930f62f97..4f5de8420 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -239,3 +239,7 @@ EXTRA_DIST += \
lib/eina/eina_config.h.in \
lib/eina/eina_strbuf_template_c.x \
lib/eina/eina_binbuf_template_c.x
+
+### Script
+
+bin_SCRIPTS = scripts/eina/eina-bench-cmp
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
new file mode 100644
index 000000000..49b8cd7ca
--- /dev/null
+++ b/src/Makefile_Evas.am
@@ -0,0 +1,1837 @@
+
+### Library
+
+lib_LTLIBRARIES += lib/evas/libevas.la
+
+installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@
+dist_installed_evasmainheaders_DATA = lib/evas/Evas.h lib/evas/Evas_GL.h
+
+noinst_HEADERS = \
+lib/evas/include/evas_inline.x \
+lib/evas/include/evas_private.h \
+lib/evas/include/evas_options.h \
+lib/evas/include/evas_macros.h \
+lib/evas/include/evas_mmx.h \
+lib/evas/include/evas_common.h \
+lib/evas/include/evas_blend_ops.h
+
+# Linebreak
+
+noinst_HEADERS += \
+static_libs/liblinebreak/linebreak.h \
+static_libs/liblinebreak/linebreakdef.h \
+static_libs/liblinebreak/wordbreakdef.h \
+static_libs/liblinebreak/wordbreak.h
+
+# Linebreak
+lib_evas_libevas_la_SOURCES = \
+static_libs/liblinebreak/linebreak.c \
+static_libs/liblinebreak/linebreakdata.c \
+static_libs/liblinebreak/linebreakdef.c \
+static_libs/liblinebreak/wordbreak.c \
+static_libs/liblinebreak/wordbreakdata.x
+
+# Main
+lib_evas_libevas_la_SOURCES += \
+lib/evas/main.c
+
+# Canvas
+lib_evas_libevas_la_SOURCES += \
+lib/evas/canvas/common_interfaces.c \
+lib/evas/canvas/evas_callbacks.c \
+lib/evas/canvas/evas_clip.c \
+lib/evas/canvas/evas_common_interface.c \
+lib/evas/canvas/evas_data.c \
+lib/evas/canvas/evas_device.c \
+lib/evas/canvas/evas_events.c \
+lib/evas/canvas/evas_filter.c \
+lib/evas/canvas/evas_focus.c \
+lib/evas/canvas/evas_key.c \
+lib/evas/canvas/evas_key_grab.c \
+lib/evas/canvas/evas_layer.c \
+lib/evas/canvas/evas_main.c \
+lib/evas/canvas/evas_name.c \
+lib/evas/canvas/evas_object_image.c \
+lib/evas/canvas/evas_object_main.c \
+lib/evas/canvas/evas_object_inform.c \
+lib/evas/canvas/evas_object_intercept.c \
+lib/evas/canvas/evas_object_line.c \
+lib/evas/canvas/evas_object_polygon.c \
+lib/evas/canvas/evas_object_rectangle.c \
+lib/evas/canvas/evas_object_smart.c \
+lib/evas/canvas/evas_object_smart_clipped.c \
+lib/evas/canvas/evas_object_box.c \
+lib/evas/canvas/evas_object_table.c \
+lib/evas/canvas/evas_object_text.c \
+lib/evas/canvas/evas_object_textblock.c \
+lib/evas/canvas/evas_object_textgrid.c \
+lib/evas/canvas/evas_object_grid.c \
+lib/evas/canvas/evas_font_dir.c \
+lib/evas/canvas/evas_rectangle.c \
+lib/evas/canvas/evas_render.c \
+lib/evas/canvas/evas_smart.c \
+lib/evas/canvas/evas_stack.c \
+lib/evas/canvas/evas_async_events.c \
+lib/evas/canvas/evas_stats.c \
+lib/evas/canvas/evas_touch_point.c \
+lib/evas/canvas/evas_map.c \
+lib/evas/canvas/evas_gl.c
+
+# Cache
+lib_evas_libevas_la_SOURCES += \
+lib/evas/cache/evas_cache_image.c \
+lib/evas/cache/evas_cache_engine_image.c \
+lib/evas/cache/evas_preload.c \
+lib/evas/cache/evas_cache.h
+
+# Cache2 - Cserve2
+if EVAS_CSERVE2
+lib_evas_libevas_la_SOURCES += \
+lib/evas/cache2/evas_cache2.c \
+lib/evas/cache2/evas_cache2.h
+
+lib_evas_libevas_la_SOURCES += \
+lib/evas/cserve2/evas_cs2.h \
+lib/evas/cserve2/evas_cs2_private.h \
+lib/evas/cserve2/evas_cs2_image_data.c \
+lib/evas/cserve2/evas_cs2_client.c
+
+lib_evas_libevas_la_SOURCES += \
+lib/evas/cserve2/evas_cs2_utils.h \
+lib/evas/cserve2/evas_cs2_utils.c
+endif
+
+# File
+lib_evas_libevas_la_SOURCES += \
+lib/evas/file/evas_path.c \
+lib/evas/file/evas_module.c \
+lib/evas/file/evas_module.h \
+lib/evas/file/evas_path.h
+
+# Engine
+lib_evas_libevas_la_SOURCES += \
+lib/evas/common/evas_op_copy_main_.c \
+lib/evas/common/evas_op_blend_main_.c \
+lib/evas/common/evas_op_add_main_.c \
+lib/evas/common/evas_op_sub_main_.c \
+lib/evas/common/evas_op_mask_main_.c \
+lib/evas/common/evas_op_mul_main_.c \
+lib/evas/common/evas_blend_main.c \
+lib/evas/common/evas_blit_main.c \
+lib/evas/common/evas_convert_color.c \
+lib/evas/common/evas_convert_colorspace.c \
+lib/evas/common/evas_convert_gry_1.c \
+lib/evas/common/evas_convert_gry_8.c \
+lib/evas/common/evas_convert_main.c \
+lib/evas/common/evas_convert_rgb_16.c \
+lib/evas/common/evas_convert_rgb_24.c \
+lib/evas/common/evas_convert_rgb_32.c \
+lib/evas/common/evas_convert_rgb_8.c \
+lib/evas/common/evas_convert_grypal_6.c \
+lib/evas/common/evas_convert_yuv.c \
+lib/evas/common/evas_cpu.c \
+lib/evas/common/evas_draw_main.c \
+lib/evas/common/evas_font_draw.c \
+lib/evas/common/evas_font_load.c \
+lib/evas/common/evas_font_main.c \
+lib/evas/common/evas_font_query.c \
+lib/evas/common/evas_image_load.c \
+lib/evas/common/evas_image_save.c \
+lib/evas/common/evas_image_main.c \
+lib/evas/common/evas_image_data.c \
+lib/evas/common/evas_image_scalecache.c \
+lib/evas/common/evas_line_main.c \
+lib/evas/common/evas_polygon_main.c \
+lib/evas/common/evas_rectangle_main.c \
+lib/evas/common/evas_scale_main.c \
+lib/evas/common/evas_scale_sample.c \
+lib/evas/common/evas_scale_smooth.c \
+lib/evas/common/evas_scale_span.c \
+lib/evas/common/evas_tiler.c \
+lib/evas/common/evas_regionbuf.c \
+lib/evas/common/evas_pipe.c \
+lib/evas/common/language/evas_bidi_utils.c \
+lib/evas/common/language/evas_language_utils.c \
+lib/evas/common/evas_text_utils.c \
+lib/evas/common/evas_font_ot.c \
+lib/evas/common/evas_map_image.c \
+lib/evas/common/evas_map_image.h \
+lib/evas/common/evas_blend.h \
+lib/evas/common/evas_blend_private.h \
+lib/evas/common/evas_convert_color.h \
+lib/evas/common/evas_convert_colorspace.h \
+lib/evas/common/evas_convert_gry_1.h \
+lib/evas/common/evas_convert_gry_8.h \
+lib/evas/common/evas_convert_grypal_6.h \
+lib/evas/common/evas_convert_main.h \
+lib/evas/common/evas_convert_rgb_16.h \
+lib/evas/common/evas_convert_rgb_24.h \
+lib/evas/common/evas_convert_rgb_32.h \
+lib/evas/common/evas_convert_rgb_8.h \
+lib/evas/common/evas_convert_yuv.h \
+lib/evas/common/evas_draw.h \
+lib/evas/common/evas_font.h \
+lib/evas/common/evas_font_default_walk.x \
+lib/evas/common/evas_font_private.h \
+lib/evas/common/evas_image.h \
+lib/evas/common/evas_image_private.h \
+lib/evas/common/evas_line.h \
+lib/evas/common/evas_polygon.h \
+lib/evas/common/evas_rectangle.h \
+lib/evas/common/evas_scale_main.h \
+lib/evas/common/evas_scale_smooth.h \
+lib/evas/common/evas_scale_span.h \
+lib/evas/common/evas_pipe.h \
+lib/evas/common/language/evas_bidi_utils.h \
+lib/evas/common/language/evas_language_utils.h \
+lib/evas/common/language/evas_script_table.h \
+lib/evas/common/evas_text_utils.h \
+lib/evas/common/evas_font_ot.h
+
+# SSE3
+lib_evas_libevas_la_SOURCES += \
+lib/evas/common/evas_op_blend/op_blend_master_sse3.c
+
+lib_evas_libevas_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_builddir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_builddir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_builddir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/lib/evas/file \
+-I$(top_builddir)/src/lib/evas/file \
+-I$(top_srcdir)/src/static_libs/liblinebreak \
+-I$(top_builddir)/src/static_libs/liblinebreak \
+-I$(top_srcdir)/src/lib/evas/common \
+-I$(top_builddir)/src/lib/evas/common \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eina \
+-I$(top_builddir)/src/lib/eo \
+-I$(top_builddir)/src/lib/eet \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@ \
+@VALGRIND_CFLAGS@ \
+@EVAS_ALTIVEC_CFLAGS@ \
+@EVAS_SSE3_CFLAGS@
+
+if HAVE_WINDOWS
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
+endif
+
+lib_evas_libevas_la_CXXFLAGS =
+
+lib_evas_libevas_la_LIBADD = \
+lib/eina/libeina.la \
+lib/eet/libeet.la \
+lib/eo/libeo.la \
+@EVAS_LIBS@ \
+-lm
+
+lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
+
+# Linebreak
+
+EXTRA_DIST += \
+static_libs/liblinebreak/LineBreak1.sed \
+static_libs/liblinebreak/LineBreak2.sed \
+static_libs/liblinebreak/linebreakdata1.tmpl \
+static_libs/liblinebreak/linebreakdata2.tmpl \
+static_libs/liblinebreak/linebreakdata3.tmpl \
+static_libs/liblinebreak/LICENCE
+
+# Engines
+
+EXTRA_DIST += \
+lib/evas/common/evas_map_image_internal.c \
+lib/evas/common/evas_map_image_core.c \
+lib/evas/common/evas_map_image_loop.c \
+lib/evas/common/evas_scale_smooth_scaler.c \
+lib/evas/common/evas_scale_smooth_scaler_down.c \
+lib/evas/common/evas_scale_smooth_scaler_downx.c \
+lib/evas/common/evas_scale_smooth_scaler_downx_downy.c \
+lib/evas/common/evas_scale_smooth_scaler_downy.c \
+lib/evas/common/evas_scale_smooth_scaler_noscale.c \
+lib/evas/common/evas_scale_smooth_scaler_up.c
+
+# evas_op_add
+
+EXTRA_DIST += \
+lib/evas/common/evas_op_add/op_add_color_.c \
+lib/evas/common/evas_op_add/op_add_color_i386.c \
+lib/evas/common/evas_op_add/op_add_mask_color_.c \
+lib/evas/common/evas_op_add/op_add_mask_color_i386.c \
+lib/evas/common/evas_op_add/op_add_pixel_.c \
+lib/evas/common/evas_op_add/op_add_pixel_color_.c \
+lib/evas/common/evas_op_add/op_add_pixel_color_i386.c \
+lib/evas/common/evas_op_add/op_add_pixel_i386.c \
+lib/evas/common/evas_op_add/op_add_pixel_mask_.c \
+lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c
+
+# evas_op_blend
+
+EXTRA_DIST += \
+lib/evas/common/evas_op_blend/op_blend_color_.c \
+lib/evas/common/evas_op_blend/op_blend_color_i386.c \
+lib/evas/common/evas_op_blend/op_blend_color_neon.c \
+lib/evas/common/evas_op_blend/op_blend_color_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c \
+lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_i386.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_neon.c \
+lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
+
+# evas_op_copy
+
+EXTRA_DIST += \
+lib/evas/common/evas_op_copy/op_copy_color_.c \
+lib/evas/common/evas_op_copy/op_copy_color_i386.c \
+lib/evas/common/evas_op_copy/op_copy_color_neon.c \
+lib/evas/common/evas_op_copy/op_copy_mask_color_.c \
+lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c \
+lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_neon.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_color_.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_i386.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c \
+lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c
+
+# evas_op_mask
+
+EXTRA_DIST += \
+lib/evas/common/evas_op_mask/op_mask_color_.c \
+lib/evas/common/evas_op_mask/op_mask_color_i386.c \
+lib/evas/common/evas_op_mask/op_mask_mask_color_.c \
+lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_color_.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_i386.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c \
+lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c
+
+# evas_op_mul
+
+EXTRA_DIST += \
+lib/evas/common/evas_op_mul/op_mul_color_.c \
+lib/evas/common/evas_op_mul/op_mul_color_i386.c \
+lib/evas/common/evas_op_mul/op_mul_mask_color_.c \
+lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_color_.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_i386.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c \
+lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c
+
+# evas_op_sub
+
+EXTRA_DIST += \
+lib/evas/common/evas_op_sub/op_sub_color_.c \
+lib/evas/common/evas_op_sub/op_sub_color_i386.c \
+lib/evas/common/evas_op_sub/op_sub_mask_color_.c \
+lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_color_.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_i386.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c \
+lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c
+
+
+### Engines
+
+if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
+lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c
+lib_evas_libevas_la_LIBADD +=
+else
+enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
+enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
+modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
+modules_evas_engines_software_generic_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la
+modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_ENGINE_BUFFER
+dist_installed_evasmainheaders_DATA += modules/evas/engines/buffer/Evas_Engine_Buffer.h
+BUFFER_SOURCES = \
+modules/evas/engines/buffer/evas_engine.c \
+modules/evas/engines/buffer/evas_outbuf.c \
+modules/evas/engines/buffer/evas_engine.h
+if EVAS_STATIC_BUILD_BUFFER
+lib_evas_libevas_la_SOURCES += $(BUFFER_SOURCES)
+else
+enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
+enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
+modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
+modules_evas_engines_buffer_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
+modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_DIRECT3D
+dist_installed_evasmainheaders_DATA += modules/evas/engines/direct3d/Evas_Engine_Direct3D.h
+DIRECT3D_SOURCES = \
+modules/evas/engines/direct3d/evas_engine.c \
+modules/evas/engines/direct3d/evas_direct3d_context.cpp \
+modules/evas/engines/direct3d/evas_direct3d_device.cpp \
+modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp \
+modules/evas/engines/direct3d/evas_direct3d_main.cpp \
+modules/evas/engines/direct3d/evas_direct3d_object.cpp \
+modules/evas/engines/direct3d/evas_direct3d_object_font.cpp \
+modules/evas/engines/direct3d/evas_direct3d_object_image.cpp \
+modules/evas/engines/direct3d/evas_direct3d_object_line.cpp \
+modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp \
+modules/evas/engines/direct3d/evas_direct3d_scene.cpp \
+modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp \
+modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp \
+modules/evas/engines/direct3d/array.h \
+modules/evas/engines/direct3d/evas_direct3d_context.h \
+modules/evas/engines/direct3d/evas_direct3d_device.h \
+modules/evas/engines/direct3d/evas_direct3d_image_cache.h \
+modules/evas/engines/direct3d/evas_direct3d_object.h \
+modules/evas/engines/direct3d/evas_direct3d_object_font.h \
+modules/evas/engines/direct3d/evas_direct3d_object_image.h \
+modules/evas/engines/direct3d/evas_direct3d_object_line.h \
+modules/evas/engines/direct3d/evas_direct3d_object_rect.h \
+modules/evas/engines/direct3d/evas_direct3d_scene.h \
+modules/evas/engines/direct3d/evas_direct3d_shader_pack.h \
+modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h \
+modules/evas/engines/direct3d/evas_engine.h \
+modules/evas/engines/direct3d/ref.h
+if EVAS_STATIC_BUILD_DIRECT3D
+lib_evas_libevas_la_SOURCES += $(DIRECT3D_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_direct3d_cflags@
+lib_evas_libevas_la_CXXFLAGS += -fno-rtti -fno-exceptions
+lib_evas_libevas_la_LIBADD += @evas_engine_direct3d_libs@
+else
+enginedirect3dpkgdir = $(libdir)/evas/modules/engines/direct3d/$(MODULE_ARCH)
+enginedirect3dpkg_LTLIBRARIES = modules/evas/engines/direct3d/module.la
+modules_evas_engines_direct3d_module_la_SOURCES = $(DIRECT3D_SOURCES)
+modules_evas_engines_direct3d_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_direct3d_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_direct3d_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
+modules_evas_engines_direct3d_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_engine_direct3d_libs@
+modules_evas_engines_direct3d_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_direct3d_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_DIRECTFB
+dist_installed_evasmainheaders_DATA += modules/evas/engines/directfb/Evas_Engine_DirectFB.h
+DIRECTFB_SOURCES = \
+modules/evas/engines/directfb/evas_engine.c \
+modules/evas/engines/directfb/polygon.c \
+modules/evas/engines/directfb/evas_engine.h
+if EVAS_STATIC_BUILD_DIRECTFB
+lib_evas_libevas_la_SOURCES += $(DIRECTFB_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_directfb_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_directfb_libs@
+else
+enginedirectfbpkgdir = $(libdir)/evas/modules/engines/directfb/$(MODULE_ARCH)
+enginedirectfbpkg_LTLIBRARIES = modules/evas/engines/directfb/module.la
+modules_evas_engines_directfb_module_la_SOURCES = $(DIRECTFB_SOURCES)
+modules_evas_engines_directfb_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_directfb_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_directfb_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_engine_directfb_libs@
+modules_evas_engines_directfb_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_directfb_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_FB
+dist_installed_evasmainheaders_DATA += modules/evas/engines/fb/Evas_Engine_FB.h
+FB_SOURCES = \
+modules/evas/engines/fb/evas_engine.c \
+modules/evas/engines/fb/evas_fb_main.c \
+modules/evas/engines/fb/evas_outbuf.c \
+modules/evas/engines/fb/evas_engine.h \
+modules/evas/engines/fb/evas_fb.h
+if EVAS_STATIC_BUILD_FB
+lib_evas_libevas_la_SOURCES += $(FB_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_fb_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_fb_libs@
+else
+enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
+enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
+modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
+modules_evas_engines_fb_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_fb_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_fb_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_engine_fb_libs@
+modules_evas_engines_fb_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_COMMON
+GL_COMMON_SOURCES = \
+modules/evas/engines/gl_common/evas_gl_private.h \
+modules/evas/engines/gl_common/evas_gl_common.h \
+modules/evas/engines/gl_common/evas_gl_context.c \
+modules/evas/engines/gl_common/evas_gl_shader.c \
+modules/evas/engines/gl_common/evas_gl_rectangle.c \
+modules/evas/engines/gl_common/evas_gl_texture.c \
+modules/evas/engines/gl_common/evas_gl_image.c \
+modules/evas/engines/gl_common/evas_gl_font.c \
+modules/evas/engines/gl_common/evas_gl_polygon.c \
+modules/evas/engines/gl_common/evas_gl_line.c \
+modules/evas/engines/gl_common/evas_gl_filter.c \
+modules/evas/engines/gl_common/evas_gl_core.c \
+modules/evas/engines/gl_common/evas_gl_api_ext.h \
+modules/evas/engines/gl_common/evas_gl_api_ext_def.h \
+modules/evas/engines/gl_common/evas_gl_core.h \
+modules/evas/engines/gl_common/evas_gl_core_private.h \
+modules/evas/engines/gl_common/evas_gl_api.c \
+modules/evas/engines/gl_common/evas_gl_api_ext.c \
+modules/evas/engines/gl_common/shader/rect_frag.h \
+modules/evas/engines/gl_common/shader/rect_vert.h \
+modules/evas/engines/gl_common/shader/font_frag.h \
+modules/evas/engines/gl_common/shader/font_vert.h \
+modules/evas/engines/gl_common/shader/img_frag.h \
+modules/evas/engines/gl_common/shader/img_vert.h \
+modules/evas/engines/gl_common/shader/img_nomul_frag.h \
+modules/evas/engines/gl_common/shader/img_nomul_vert.h \
+modules/evas/engines/gl_common/shader/img_bgra_frag.h \
+modules/evas/engines/gl_common/shader/img_bgra_vert.h \
+modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h \
+modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h \
+modules/evas/engines/gl_common/shader/img_mask_frag.h \
+modules/evas/engines/gl_common/shader/img_mask_vert.h \
+modules/evas/engines/gl_common/shader/nv12_nomul_vert.h \
+modules/evas/engines/gl_common/shader/nv12_vert.h \
+modules/evas/engines/gl_common/shader/nv12_nomul_frag.h \
+modules/evas/engines/gl_common/shader/nv12_frag.h \
+modules/evas/engines/gl_common/shader/yuv_frag.h \
+modules/evas/engines/gl_common/shader/yuv_vert.h \
+modules/evas/engines/gl_common/shader/yuv_nomul_frag.h \
+modules/evas/engines/gl_common/shader/yuv_nomul_vert.h \
+modules/evas/engines/gl_common/shader/tex_frag.h \
+modules/evas/engines/gl_common/shader/tex_vert.h \
+modules/evas/engines/gl_common/shader/tex_nomul_frag.h \
+modules/evas/engines/gl_common/shader/tex_nomul_vert.h \
+modules/evas/engines/gl_common/shader/filter_invert.h \
+modules/evas/engines/gl_common/shader/filter_invert_nomul.h \
+modules/evas/engines/gl_common/shader/filter_invert_bgra.h \
+modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h \
+modules/evas/engines/gl_common/shader/filter_sepia.h \
+modules/evas/engines/gl_common/shader/filter_sepia_nomul.h \
+modules/evas/engines/gl_common/shader/filter_sepia_bgra.h \
+modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h \
+modules/evas/engines/gl_common/shader/filter_greyscale.h \
+modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h \
+modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h \
+modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h \
+modules/evas/engines/gl_common/shader/filter_blur.h \
+modules/evas/engines/gl_common/shader/filter_blur_nomul.h \
+modules/evas/engines/gl_common/shader/filter_blur_bgra.h \
+modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h \
+modules/evas/engines/gl_common/shader/yuy2_frag.h \
+modules/evas/engines/gl_common/shader/yuy2_vert.h \
+modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h \
+modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h
+EXTRA_DIST += \
+modules/evas/engines/gl_common/shader/compile.sh \
+modules/evas/engines/gl_common/shader/make-c-str.sh \
+modules/evas/engines/gl_common/shader/rect_frag.shd \
+modules/evas/engines/gl_common/shader/rect_vert.shd \
+modules/evas/engines/gl_common/shader/font_frag.shd \
+modules/evas/engines/gl_common/shader/font_vert.shd \
+modules/evas/engines/gl_common/shader/img_frag.shd \
+modules/evas/engines/gl_common/shader/img_vert.shd \
+modules/evas/engines/gl_common/shader/img_nomul_frag.shd \
+modules/evas/engines/gl_common/shader/img_nomul_vert.shd \
+modules/evas/engines/gl_common/shader/img_bgra_vert.shd \
+modules/evas/engines/gl_common/shader/img_bgra_frag.shd \
+modules/evas/engines/gl_common/shader/img_bgra_vert.shd \
+modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd \
+modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd \
+modules/evas/engines/gl_common/shader/img_mask_frag.h \
+modules/evas/engines/gl_common/shader/img_mask_vert.h \
+modules/evas/engines/gl_common/shader/yuv_frag.shd \
+modules/evas/engines/gl_common/shader/yuv_vert.shd \
+modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd \
+modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd \
+modules/evas/engines/gl_common/shader/tex_frag.shd \
+modules/evas/engines/gl_common/shader/tex_vert.shd \
+modules/evas/engines/gl_common/shader/tex_nomul_frag.shd \
+modules/evas/engines/gl_common/shader/tex_nomul_vert.shd \
+modules/evas/engines/gl_common/shader/filter_invert.shd \
+modules/evas/engines/gl_common/shader/filter_invert_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_invert_bgra.shd \
+modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_greyscale.shd \
+modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd \
+modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_sepia.shd \
+modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd \
+modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_blur.shd \
+modules/evas/engines/gl_common/shader/filter_blur_nomul.shd \
+modules/evas/engines/gl_common/shader/filter_blur_bgra.shd \
+modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd \
+modules/evas/engines/gl_common/shader/nv12_frag.h \
+modules/evas/engines/gl_common/shader/nv12_frag.shd \
+modules/evas/engines/gl_common/shader/nv12_nomul_frag.h \
+modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd \
+modules/evas/engines/gl_common/shader/nv12_nomul_vert.h \
+modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd \
+modules/evas/engines/gl_common/shader/nv12_vert.h \
+modules/evas/engines/gl_common/shader/nv12_vert.shd \
+modules/evas/engines/gl_common/shader/yuy2_frag.h \
+modules/evas/engines/gl_common/shader/yuy2_frag.shd \
+modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h \
+modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd \
+modules/evas/engines/gl_common/shader/yuy2_nomul_vert.h \
+modules/evas/engines/gl_common/shader/yuy2_nomul_vert.shd \
+modules/evas/engines/gl_common/shader/yuy2_vert.h \
+modules/evas/engines/gl_common/shader/yuy2_vert.shd
+if EVAS_STATIC_BUILD_GL_COMMON
+lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES)
+lib_evas_libevas_la_LIBADD += @GL_EET_LIBS@ @evas_engine_gl_common_libs@
+else
+noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@GL_EET_CFLAGS@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@GL_EET_LIBS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_COCOA
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
+GL_COCOA_SOURCES = \
+modules/evas/engines/gl_cocoa/evas_engine.c \
+modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m \
+modules/evas/engines/gl_cocoa/evas_engine.h
+if EVAS_STATIC_BUILD_GL_COCOA
+lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@GL_EET_CFLAGS@ \
+@evas_engine_gl_cocoa_cflags@
+lib_evas_libevas_la_LIBADD += \
+lib/evas/libevas.la \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+@GL_EET_LIBS@ \
+@evas_engine_gl_cocoa_libs@
+else
+engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
+engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
+modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
+modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@evas_engine_gl_cocoa_cflags@ \
+@GL_EET_CFLAGS@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_gl_cocoa_module_la_LIBADD = \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+lib/evas/libevas.la \
+@GL_EET_LIBS@ \
+@EFL_LIBS@ \
+@evas_engine_gl_cocoa_libs@
+modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_SDL
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h
+GL_SDL_SOURCES = \
+modules/evas/engines/gl_sdl/evas_engine.c \
+modules/evas/engines/gl_sdl/evas_engine.h
+if EVAS_STATIC_BUILD_GL_SDL
+lib_evas_libevas_la_SOURCES += $(GL_SDL_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@evas_engine_gl_sdl_cflags@
+lib_evas_libevas_la_LIBADD += \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+@evas_engine_gl_sdl_libs@
+else
+engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
+engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
+modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
+modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@evas_engine_gl_sdl_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_gl_sdl_module_la_LIBADD = \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_engine_gl_sdl_libs@
+modules_evas_engines_gl_sdl_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_GL_X11
+dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_x11/Evas_Engine_GL_X11.h
+GL_X11_SOURCES = \
+modules/evas/engines/gl_x11/evas_engine.c \
+modules/evas/engines/gl_x11/evas_x_main.c \
+modules/evas/engines/gl_x11/evas_engine.h
+if EVAS_STATIC_BUILD_GL_X11
+lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@GL_EET_CFLAGS@ \
+@evas_engine_gl_xlib_cflags@
+lib_evas_libevas_la_LIBADD += \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+@evas_engine_gl_xlib_libs@
+else
+engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
+engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
+modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
+modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@evas_engine_gl_xlib_cflags@ \
+@GL_EET_CFLAGS@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_gl_x11_module_la_LIBADD = \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la \
+lib/evas/libevas.la \
+@GL_EET_LIBS@ \
+@EFL_LIBS@ \
+@evas_engine_gl_xlib_libs@
+modules_evas_engines_gl_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_PSL1GHT
+dist_installed_evasmainheaders_DATA += modules/evas/engines/psl1ght/Evas_Engine_PSL1GHT.h
+PSL1GHT_SOURCES = \
+modules/evas/engines/psl1ght/evas_engine.c \
+modules/evas/engines/psl1ght/rsxutil.c \
+modules/evas/engines/psl1ght/evas_engine.h \
+modules/evas/engines/psl1ght/rsxutil.h
+if EVAS_STATIC_BUILD_PSL1GHT
+lib_evas_libevas_la_SOURCES += $(PSL1GHT_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @GL_EET_CFLAGS@ @evas_engine_psl1ght_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_psl1ght_libs@
+else
+enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
+enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la
+modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES)
+modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_psl1ght_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_psl1ght_module_la_LIBADD = \
+lib/evas/libevas.la \
+@evas_engine_psl1ght_libs@ \
+@EFL_LIBS@
+modules_evas_engines_psl1ght_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_SOFTWARE_DDRAW
+dist_installed_evasmainheaders_DATA += modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h
+SOFTWARE_DDRAW_SOURCES = \
+modules/evas/engines/software_ddraw/evas_engine.c \
+modules/evas/engines/software_ddraw/evas_outbuf.c \
+modules/evas/engines/software_ddraw/evas_ddraw_buffer.c \
+modules/evas/engines/software_ddraw/evas_ddraw_main.cpp \
+modules/evas/engines/software_ddraw/evas_engine.h
+if EVAS_STATIC_BUILD_SOFTWARE_DDRAW
+lib_evas_libevas_la_SOURCES += $(SOFTWARE_DDRAW_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_software_ddraw_cflags@
+lib_evas_libevas_la_CXXFLAGS += -fno-rtti -fno-exceptions
+lib_evas_libevas_la_LIBADD += @evas_engine_software_ddraw_libs@
+else
+enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODULE_ARCH)
+enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la
+modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
+modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_software_ddraw_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
+modules_evas_engines_software_ddraw_module_la_LIBADD = \
+lib/evas/libevas.la \
+@evas_engine_software_ddraw_libs@ \
+@EFL_LIBS@
+modules_evas_engines_software_ddraw_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_SOFTWARE_GDI
+dist_installed_evasmainheaders_DATA += modules/evas/engines/software_gdi/Evas_Engine_Software_Gdi.h
+SOFTWARE_GDI_SOURCES = \
+modules/evas/engines/software_gdi/evas_engine.c \
+modules/evas/engines/software_gdi/evas_outbuf.c \
+modules/evas/engines/software_gdi/evas_gdi_buffer.c \
+modules/evas/engines/software_gdi/evas_gdi_main.c \
+modules/evas/engines/software_gdi/evas_engine.h
+if EVAS_STATIC_BUILD_SOFTWARE_GDI
+lib_evas_libevas_la_SOURCES += $(SOFTWARE_GDI_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_software_gdi_cflags@
+lib_evas_libevas_la_LIBADD += @evas_engine_software_gdi_libs@
+else
+enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_ARCH)
+enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
+modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
+modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_software_gdi_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_software_gdi_module_la_LIBADD = \
+lib/evas/libevas.la \
+@evas_engine_software_gdi_libs@ \
+@EFL_LIBS@
+modules_evas_engines_software_gdi_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_SOFTWARE_X11
+dist_installed_evasmainheaders_DATA += modules/evas/engines/software_x11/Evas_Engine_Software_X11.h
+SOFTWARE_X11_SOURCES = \
+modules/evas/engines/software_x11/evas_engine.c \
+modules/evas/engines/software_x11/evas_x_egl.c \
+modules/evas/engines/software_x11/evas_x_egl.h
+SOFTWARE_X11_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+SOFTWARE_X11_LIBADD =
+if BUILD_ENGINE_SOFTWARE_XLIB
+SOFTWARE_X11_SOURCES += \
+modules/evas/engines/software_x11/evas_xlib_outbuf.c \
+modules/evas/engines/software_x11/evas_xlib_buffer.c \
+modules/evas/engines/software_x11/evas_xlib_color.c \
+modules/evas/engines/software_x11/evas_xlib_main.c
+SOFTWARE_X11_CPPFLAGS += @evas_engine_software_xlib_cflags@
+SOFTWARE_X11_LIBADD += @evas_engine_software_xlib_libs@
+endif
+if BUILD_ENGINE_SOFTWARE_XCB
+SOFTWARE_X11_SOURCES += \
+modules/evas/engines/software_x11/evas_xcb_xdefaults.c \
+modules/evas/engines/software_x11/evas_xcb_outbuf.c \
+modules/evas/engines/software_x11/evas_xcb_buffer.c \
+modules/evas/engines/software_x11/evas_xcb_color.c \
+modules/evas/engines/software_x11/evas_xcb_main.c \
+modules/evas/engines/software_x11/evas_engine.h \
+modules/evas/engines/software_x11/evas_xlib_outbuf.h \
+modules/evas/engines/software_x11/evas_xlib_buffer.h \
+modules/evas/engines/software_x11/evas_xlib_color.h \
+modules/evas/engines/software_x11/evas_xcb_outbuf.h \
+modules/evas/engines/software_x11/evas_xcb_buffer.h \
+modules/evas/engines/software_x11/evas_xcb_color.h \
+modules/evas/engines/software_x11/evas_xcb_xdefaults.h
+SOFTWARE_X11_CPPFLAGS += @evas_engine_software_xcb_cflags@
+SOFTWARE_X11_LIBADD += @evas_engine_software_xcb_libs@
+endif
+if EVAS_STATIC_BUILD_SOFTWARE_X11
+lib_evas_libevas_la_SOURCES += $(SOFTWARE_X11_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += $(SOFTWARE_X11_CPPFLAGS)
+lib_evas_libevas_la_LIBADD += $(SOFTWARE_X11_LIBADD)
+else
+enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_ARCH)
+enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
+modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
+modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS)
+modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ $(SOFTWARE_X11_LIBADD)
+modules_evas_engines_software_x11_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_WAYLAND_EGL
+dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+WAYLAND_EGL_SOURCES = \
+modules/evas/engines/wayland_egl/evas_engine.c \
+modules/evas/engines/wayland_egl/evas_wl_main.c \
+modules/evas/engines/wayland_egl/evas_engine.h
+if EVAS_STATIC_BUILD_WAYLAND_EGL
+lib_evas_libevas_la_SOURCES += $(WAYLAND_EGL_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@
+lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_egl_libs@
+else
+enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH)
+enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
+modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
+modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_wayland_egl_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_wayland_egl_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_engine_wayland_egl_libs@
+modules_evas_engines_wayland_egl_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_ENGINE_WAYLAND_SHM
+dist_installed_evasmainheaders_DATA += modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
+WAYLAND_SHM_SOURCES = \
+modules/evas/engines/wayland_shm/evas_engine.c \
+modules/evas/engines/wayland_shm/evas_outbuf.c \
+modules/evas/engines/wayland_shm/evas_engine.h
+if EVAS_STATIC_BUILD_WAYLAND_SHM
+lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES)
+lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@
+lib_evas_libevas_la_LIBADD += lib/evas/libevas.la @EFL_LIBS@ @evas_engine_wayland_shm_libs@
+else
+enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH)
+enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
+modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
+modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@evas_engine_wayland_shm_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_engines_wayland_shm_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_engine_wayland_shm_libs@
+modules_evas_engines_wayland_shm_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+### Loaders and savers
+
+if BUILD_LOADER_BMP
+if EVAS_STATIC_BUILD_BMP
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/bmp/evas_image_load_bmp.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_bmp_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_bmp_libs@
+else
+loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
+loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
+modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c
+modules_evas_loaders_bmp_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_bmp_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_bmp_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_bmp_libs@ \
+-lm
+modules_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_EET
+if EVAS_STATIC_BUILD_EET
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/eet/evas_image_load_eet.c modules/evas/savers/eet/evas_image_save_eet.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_eet_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_eet_libs@
+else
+loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
+loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
+modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c
+modules_evas_loaders_eet_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_eet_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_eet_module_la_LIBADD = \
+lib/evas/libevas.la \
+lib/evas/libeet.la \
+@evas_image_loader_eet_libs@
+modules_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_GENERIC
+if EVAS_STATIC_BUILD_GENERIC
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/generic/evas_image_load_generic.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_generic_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_generic_libs@
+else
+loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
+loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
+modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c
+modules_evas_loaders_generic_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_generic_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_generic_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_generic_libs@
+modules_evas_loaders_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_GIF
+if EVAS_STATIC_BUILD_GIF
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/gif/evas_image_load_gif.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_gif_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_gif_libs@
+else
+loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
+loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
+modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c
+modules_evas_loaders_gif_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_gif_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_gif_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_gif_libs@
+modules_evas_loaders_gif_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_ICO
+if EVAS_STATIC_BUILD_ICO
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/ico/evas_image_load_ico.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_ico_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_ico_libs@
+else
+loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
+loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
+modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c
+modules_evas_loaders_ico_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_ico_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_ico_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_ico_libs@
+modules_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_JPEG
+if EVAS_STATIC_BUILD_JPEG
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+if BUILD_SAVER_JPEG
+lib_evas_libevas_la_SOURCES += modules/evas/savers/jpeg/evas_image_save_jpeg.c
+endif
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_jpeg_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_jpeg_libs@
+else
+loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
+loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
+modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_jpeg_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_jpeg_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_jpeg_libs@
+modules_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
+if BUILD_SAVER_JPEG
+saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
+saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
+modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
+modules_evas_savers_jpeg_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_jpeg_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_savers_jpeg_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_jpeg_libs@
+modules_evas_savers_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+endif
+
+if BUILD_LOADER_PMAPS
+if EVAS_STATIC_BUILD_PMAPS
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/pmaps/evas_image_load_pmaps.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_pmaps_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_pmaps_libs@
+else
+loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
+loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la
+modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c
+modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_pmaps_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_pmaps_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_pmaps_libs@
+modules_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_PNG
+if EVAS_STATIC_BUILD_PNG
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/png/evas_image_load_png.c modules/evas/savers/png/evas_image_save_png.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_png_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_png_libs@
+else
+loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
+loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la
+modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c
+modules_evas_loaders_png_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_png_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_png_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_png_libs@
+modules_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
+saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la
+modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c
+modules_evas_savers_png_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_png_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_savers_png_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_png_libs@
+modules_evas_savers_png_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_PSD
+if EVAS_STATIC_BUILD_PSD
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/psd/evas_image_load_psd.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_psd_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_psd_libs@
+else
+loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
+loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la
+modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c
+modules_evas_loaders_psd_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_psd_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_psd_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_psd_libs@
+modules_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_SVG
+if EVAS_STATIC_BUILD_SVG
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/svg/evas_image_load_esvg.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_svg_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_svg_libs@
+else
+loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
+loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la
+modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c
+modules_evas_loaders_svg_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_svg_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_svg_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_svg_libs@
+modules_evas_loaders_svg_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_TGA
+if EVAS_STATIC_BUILD_TGA
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tga_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_tga_libs@
+else
+loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH)
+loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la
+modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c
+modules_evas_loaders_tga_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_tga_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_tga_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_tga_libs@
+modules_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_TIFF
+if EVAS_STATIC_BUILD_TIFF
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/tiff/evas_image_load_tiff.c modules/evas/savers/tiff/evas_image_save_tiff.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_tiff_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_tiff_libs@
+else
+loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
+loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la
+modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c
+modules_evas_loaders_tiff_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_tiff_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_tiff_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_tiff_libs@
+modules_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH)
+savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la
+modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c
+modules_evas_savers_tiff_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_tiff_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_savers_tiff_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_tiff_libs@
+modules_evas_savers_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_WBMP
+if EVAS_STATIC_BUILD_WBMP
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/wbmp/evas_image_load_wbmp.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_wbmp_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_wbmp_libs@
+else
+loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH)
+loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la
+modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c
+modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_wbmp_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_wbmp_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_wbmp_libs@
+modules_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_WEBP
+if EVAS_STATIC_BUILD_WEBP
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/webp/evas_image_load_webp.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_webp_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_webp_libs@
+else
+loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH)
+loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la
+modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c
+modules_evas_loaders_webp_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_webp_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_webp_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_webp_libs@
+modules_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+if BUILD_LOADER_XPM
+if EVAS_STATIC_BUILD_XPM
+lib_evas_libevas_la_SOURCES += modules/evas/loaders/xpm/evas_image_load_xpm.c
+lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_xpm_cflags@
+lib_evas_libevas_la_LIBADD += @evas_image_loader_xpm_libs@
+else
+loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
+loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la
+modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c
+modules_evas_loaders_xpm_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+@evas_image_loader_xpm_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+modules_evas_loaders_xpm_module_la_LIBADD = \
+lib/evas/libevas.la \
+@EFL_LIBS@ \
+@evas_image_loader_xpm_libs@
+modules_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version
+modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+endif
+
+### binary
+
+libexec_PROGRAMS = \
+bin/evas/evas_cserve2 \
+bin/evas/evas_cserve2_slave \
+bin/evas/dummy_slave
+
+bin_PROGRAMS += \
+bin/evas/evas_cserve2_client \
+bin/evas/evas_cserve2_usage \
+bin/evas/evas_cserve2_debug
+
+bin_evas_evas_cserve2_SOURCES = \
+bin/evas/evas_cserve2.h \
+bin/evas/evas_cserve2_slave.h \
+bin/evas/evas_cserve2_main.c \
+bin/evas/evas_cserve2_slaves.c \
+bin/evas/evas_cserve2_messages.c \
+bin/evas/evas_cserve2_shm.c \
+bin/evas/evas_cserve2_cache.c \
+bin/evas/evas_cserve2_requests.c \
+bin/evas/evas_cserve2_fonts.c \
+bin/evas/evas_cserve2_main_loop_linux.c \
+lib/evas/cserve2/evas_cs2_utils.h \
+lib/evas/cserve2/evas_cs2_utils.c
+
+bin_evas_evas_cserve2_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_builddir)/src/lib/eet \
+-DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \
+@EVAS_CFLAGS@ \
+@EFL_CFLAGS@
+
+bin_evas_evas_cserve2_LDADD = \
+@EVAS_LIBS@ \
+@EFL_LIBS@ \
+lib/eet/libeet.la \
+lib/evas/libevas.la
+
+bin_evas_evas_cserve2_client_SOURCES = \
+bin/evas/evas_cserve2_client.c
+
+bin_evas_evas_cserve2_client_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EVAS_CFLAGS@ \
+@EFL_CFLAGS@
+
+bin_evas_evas_cserve2_usage_SOURCES = \
+bin/evas/evas_cserve2_usage.c
+
+bin_evas_evas_cserve2_usage_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EVAS_CFLAGS@ \
+@EFL_CFLAGS@
+
+bin_evas_evas_cserve2_usage_LDADD = \
+lib/eina/libeina.la \
+@EFL_LIBS@ \
+@EVAS_LIBS@
+
+bin_evas_evas_cserve2_debug_SOURCES = \
+bin/evas/evas_cserve2_debug.c
+
+bin_evas_evas_cserve2_debug_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EVAS_CFLAGS@ \
+@EFL_CFLAGS@
+
+bin_evas_evas_cserve2_debug_LDADD = \
+lib/eina/libeina.la \
+@EFL_LIBS@ \
+@EVAS_LIBS@
+
+bin_evas_evas_cserve2_slave_SOURCES = \
+bin/evas/evas_cserve2_slave.c \
+bin/evas/evas_cserve2_utils.c
+
+bin_evas_evas_cserve2_slave_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+@EVAS_CFLAGS@ \
+@EFL_CFLAGS@
+
+bin_evas_evas_cserve2_slave_LDADD = \
+lib/eina/libeina.la \
+@EFL_LIBS@ \
+@EVAS_LIBS@
+
+bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
+
+bin_evas_dummy_slave_SOURCES = \
+bin/evas/dummy_slave.c
+
+bin_evas_dummy_slave_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+@EVAS_CFLAGS@ \
+@EFL_CFLAGS@
+
+bin_evas_dummy_slave_LDADD = \
+lib/eina/libeina.la \
+@EFL_LIBS@ \
+@EVAS_LIBS@
+
+### Cserve2 loaders
+
+if BUILD_LOADER_BMP
+cserve2bmppkgdir = $(libdir)/evas/cserve2/loaders/bmp/$(MODULE_ARCH)
+cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la
+bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c
+bin_evas_loaders_bmp_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm
+bin_evas_loaders_bmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_EET
+cserve2eetpkgdir = $(libdir)/evas/cserve2/loaders/eet/$(MODULE_ARCH)
+cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la
+bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c
+bin_evas_loaders_eet_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/eet \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_eet_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_eet_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_eet_libs@
+bin_evas_loaders_eet_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_ICO
+cserve2icopkgdir = $(libdir)/evas/cserve2/loaders/ico/$(MODULE_ARCH)
+cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la
+bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c
+bin_evas_loaders_ico_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_ico_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_ico_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_ico_libs@
+bin_evas_loaders_ico_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_JPEG
+cserve2jpegpkgdir = $(libdir)/evas/cserve2/loaders/jpeg/$(MODULE_ARCH)
+cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la
+bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c
+bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_jpeg_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_jpeg_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_jpeg_libs@
+bin_evas_loaders_jpeg_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_PMAPS
+cserve2pmapspkgdir = $(libdir)/evas/cserve2/loaders/pmaps/$(MODULE_ARCH)
+cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la
+bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c
+bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_pmaps_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_pmaps_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_pmaps_libs@
+bin_evas_loaders_pmaps_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_PNG
+cserve2pngpkgdir = $(libdir)/evas/cserve2/loaders/png/$(MODULE_ARCH)
+cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la
+bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c
+bin_evas_loaders_png_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_png_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_png_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_png_libs@
+bin_evas_loaders_png_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_PSD
+cserve2psdpkgdir = $(libdir)/evas/cserve2/loaders/psd/$(MODULE_ARCH)
+cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la
+bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c
+bin_evas_loaders_psd_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_psd_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_psd_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_psd_libs@
+bin_evas_loaders_psd_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_TGA
+cserve2tgapkgdir = $(libdir)/evas/cserve2/loaders/tga/$(MODULE_ARCH)
+cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la
+bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c
+bin_evas_loaders_tga_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_tga_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_tga_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tga_libs@
+bin_evas_loaders_tga_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_TIFF
+cserve2tiffpkgdir = $(libdir)/evas/cserve2/loaders/tiff/$(MODULE_ARCH)
+cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la
+bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c
+bin_evas_loaders_tiff_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_tiff_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_tiff_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_tiff_libs@
+bin_evas_loaders_tiff_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_WBMP
+cserve2wbmppkgdir = $(libdir)/evas/cserve2/loaders/wbmp/$(MODULE_ARCH)
+cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la
+bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c
+bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_wbmp_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_wbmp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_wbmp_libs@
+bin_evas_loaders_wbmp_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_WEBP
+cserve2webppkgdir = $(libdir)/evas/cserve2/loaders/webp/$(MODULE_ARCH)
+cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la
+bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c
+bin_evas_loaders_webp_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_webp_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_webp_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_webp_libs@
+bin_evas_loaders_webp_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif
+
+if BUILD_LOADER_XPM
+cserve2xpmpkgdir = $(libdir)/evas/cserve2/loaders/xpm/$(MODULE_ARCH)
+cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la
+bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c
+bin_evas_loaders_xpm_module_la_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/eina \
+-I$(top_srcdir)/src/lib/eo \
+-I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/bin/evas \
+@evas_image_loader_xpm_cflags@ \
+@EFL_CFLAGS@ \
+@EVAS_CFLAGS@
+bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@
+bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version
+bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
+endif \ No newline at end of file
diff --git a/legacy/evas/src/bin/dummy_slave.c b/src/bin/evas/dummy_slave.c
index 398d86ece..ba815dc66 100644
--- a/legacy/evas/src/bin/dummy_slave.c
+++ b/src/bin/evas/dummy_slave.c
@@ -115,7 +115,7 @@ _cserve2_shm_unmap(void *map, size_t length)
*/
static Error_Type
-image_open(const char *file __UNUSED__, const char *key __UNUSED__, Slave_Msg_Image_Opened *result)
+image_open(const char *file EINA_UNUSED, const char *key EINA_UNUSED, Slave_Msg_Image_Opened *result)
{
memset(result, 0, sizeof(*result));
result->w = 32;
diff --git a/legacy/evas/src/bin/evas_cserve2.h b/src/bin/evas/evas_cserve2.h
index 35603873b..35603873b 100644
--- a/legacy/evas/src/bin/evas_cserve2.h
+++ b/src/bin/evas/evas_cserve2.h
diff --git a/legacy/evas/src/bin/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index 5e7783b58..6ae8a42a6 100644
--- a/legacy/evas/src/bin/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -352,7 +352,7 @@ _open_request_build(File_Data *f, int *bufsize)
}
static void
-_request_free(void *msg, void *data __UNUSED__)
+_request_free(void *msg, void *data EINA_UNUSED)
{
free(msg);
}
@@ -381,7 +381,7 @@ _open_request_response(File_Data *e, Slave_Msg_Image_Opened *resp, int *size)
}
static void
-_request_failed(Entry *e, Error_Type type __UNUSED__)
+_request_failed(Entry *e, Error_Type type EINA_UNUSED)
{
Eina_List *l;
Reference *ref;
@@ -628,7 +628,7 @@ _file_watch_free(void *data)
}
static int
-_font_entry_cmp(const Font_Entry *k1, int k1_length __UNUSED__, const Font_Entry *k2, int k2_length __UNUSED__)
+_font_entry_cmp(const Font_Entry *k1, int k1_length EINA_UNUSED, const Font_Entry *k2, int k2_length EINA_UNUSED)
{
if (k1->src->key == k2->src->key)
{
@@ -644,7 +644,7 @@ _font_entry_cmp(const Font_Entry *k1, int k1_length __UNUSED__, const Font_Entry
}
static int
-_font_entry_key_hash(const Font_Entry *key, int key_length __UNUSED__)
+_font_entry_key_hash(const Font_Entry *key, int key_length EINA_UNUSED)
{
int hash;
hash = eina_hash_djb2(key->src->key, eina_stringshare_strlen(key->src->key) + 1);
@@ -978,7 +978,7 @@ _image_msg_new(Client *client, Msg_Setopts *msg)
}
static void
-_file_changed_cb(const char *path __UNUSED__, Eina_Bool deleted __UNUSED__, void *data)
+_file_changed_cb(const char *path EINA_UNUSED, Eina_Bool deleted EINA_UNUSED, void *data)
{
File_Watch *fw = data;
File_Data *e;
@@ -1067,7 +1067,7 @@ _font_load_request_build(void *data, int *size)
}
static void
-_font_load_request_free(void *msg, void *data __UNUSED__)
+_font_load_request_free(void *msg, void *data EINA_UNUSED)
{
free(msg);
}
@@ -1097,7 +1097,7 @@ _font_load_request_response(Font_Entry *fe, Slave_Msg_Font_Loaded *msg, int *siz
}
static void
-_font_load_request_failed(Font_Entry *fe, Error_Type error __UNUSED__)
+_font_load_request_failed(Font_Entry *fe, Error_Type error EINA_UNUSED)
{
Eina_List *l;
Reference *ref;
@@ -1405,7 +1405,7 @@ _glyphs_load_request_prepare(Glyphs_Request *req)
}
static void *
-_glyphs_load_request_build(void *data, int *size __UNUSED__)
+_glyphs_load_request_build(void *data, int *size EINA_UNUSED)
{
Glyphs_Request *req = data;
Slave_Msg_Font_Glyphs_Load *msg = NULL;
@@ -1516,7 +1516,7 @@ _glyphs_load_request_response(Glyphs_Request *req, Slave_Msg_Font_Glyphs_Loaded
}
static void
-_glyphs_load_request_failed(void *data __UNUSED__, Error_Type error __UNUSED__)
+_glyphs_load_request_failed(void *data EINA_UNUSED, Error_Type error EINA_UNUSED)
{
}
@@ -1528,7 +1528,7 @@ static Slave_Request_Funcs _glyphs_load_funcs = {
};
static Eina_Bool
-_font_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
+_font_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
{
Font_Entry *fe = data;
Msg_Stats *msg = fdata;
@@ -1577,7 +1577,7 @@ _font_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED_
}
static Eina_Bool
-_image_file_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
+_image_file_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
{
Msg_Stats *msg = fdata;
File_Data *fd = data;
@@ -1601,7 +1601,7 @@ _image_file_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __U
}
static Eina_Bool
-_image_data_entry_stats_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
+_image_data_entry_stats_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
{
Msg_Stats *msg = fdata;
Image_Data *id = data;
@@ -1648,7 +1648,7 @@ struct _debug_info
};
static Eina_Bool
-_font_entry_debug_size_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
+_font_entry_debug_size_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
{
struct _debug_info *di = fdata;
unsigned int size = di->size;
@@ -1713,7 +1713,7 @@ _font_entry_debug_size_cb(const Eina_Hash *hash __UNUSED__, const void *key __UN
}
static Eina_Bool
-_font_entry_debug_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
+_font_entry_debug_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
{
char **pos = fdata;
char *buf = *pos;
@@ -2222,7 +2222,7 @@ cserve2_cache_font_load(Client *client, const char *source, unsigned int sourcel
}
int
-cserve2_cache_font_unload(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid __UNUSED__)
+cserve2_cache_font_unload(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid EINA_UNUSED)
{
Font_Entry *fe;
char *fullname;
@@ -2276,7 +2276,7 @@ cserve2_cache_font_glyphs_load(Client *client, const char *source, unsigned int
}
int
-cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid __UNUSED__)
+cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid EINA_UNUSED)
{
Glyphs_Group *gg;
Eina_List *groups;
diff --git a/legacy/evas/src/bin/evas_cserve2_client.c b/src/bin/evas/evas_cserve2_client.c
index 5ced01764..5ced01764 100644
--- a/legacy/evas/src/bin/evas_cserve2_client.c
+++ b/src/bin/evas/evas_cserve2_client.c
diff --git a/legacy/evas/src/bin/evas_cserve2_debug.c b/src/bin/evas/evas_cserve2_debug.c
index c86045c64..c86045c64 100644
--- a/legacy/evas/src/bin/evas_cserve2_debug.c
+++ b/src/bin/evas/evas_cserve2_debug.c
diff --git a/legacy/evas/src/bin/evas_cserve2_fonts.c b/src/bin/evas/evas_cserve2_fonts.c
index cd6adabf5..211ee4750 100644
--- a/legacy/evas/src/bin/evas_cserve2_fonts.c
+++ b/src/bin/evas/evas_cserve2_fonts.c
@@ -239,7 +239,7 @@ _font_slave_int_load(const Slave_Msg_Font_Load *msg, Font_Source_Info *fsi)
}
static Slave_Msg_Font_Loaded *
-_font_slave_load(const void *cmddata, void *data __UNUSED__)
+_font_slave_load(const void *cmddata, void *data EINA_UNUSED)
{
const Slave_Msg_Font_Load *msg = cmddata;
Slave_Msg_Font_Loaded *response;
@@ -450,7 +450,7 @@ _timeval_sub(const struct timeval *tv2, const struct timeval *tv1)
#endif
static Slave_Msg_Font_Glyphs_Loaded *
-_font_slave_glyphs_load(const void *cmddata, void *data __UNUSED__)
+_font_slave_glyphs_load(const void *cmddata, void *data EINA_UNUSED)
{
const Slave_Msg_Font_Glyphs_Load *msg = cmddata;
Slave_Msg_Font_Glyphs_Loaded *response;
@@ -559,7 +559,7 @@ _font_slave_glyphs_load(const void *cmddata, void *data __UNUSED__)
}
void *
-cserve2_font_slave_cb(Slave_Thread_Data *sd __UNUSED__, Slave_Command *cmd, const void *cmddata, void *data)
+cserve2_font_slave_cb(Slave_Thread_Data *sd EINA_UNUSED, Slave_Command *cmd, const void *cmddata, void *data)
{
void *response = NULL;
diff --git a/legacy/evas/src/bin/evas_cserve2_main.c b/src/bin/evas/evas_cserve2_main.c
index 0f4afcbe0..8b72ecc4e 100644
--- a/legacy/evas/src/bin/evas_cserve2_main.c
+++ b/src/bin/evas/evas_cserve2_main.c
@@ -309,7 +309,7 @@ _clients_finish(void)
}
int
-main(int argc __UNUSED__, const char *argv[] __UNUSED__)
+main(int argc EINA_UNUSED, const char *argv[] EINA_UNUSED)
{
eina_init();
diff --git a/legacy/evas/src/bin/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c
index e8da35298..afd678ee3 100644
--- a/legacy/evas/src/bin/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -65,7 +65,7 @@ static Main_Loop_Child_Dead_Cb reap_children_func = NULL;
#endif
static void
-_signal_handle_child(struct signalfd_siginfo *sinfo __UNUSED__)
+_signal_handle_child(struct signalfd_siginfo *sinfo EINA_UNUSED)
{
int status;
pid_t pid;
@@ -90,21 +90,21 @@ _signal_handle_child(struct signalfd_siginfo *sinfo __UNUSED__)
}
static void
-_signal_handle_int(struct signalfd_siginfo *sinfo __UNUSED__)
+_signal_handle_int(struct signalfd_siginfo *sinfo EINA_UNUSED)
{
DBG("Received SIGINT. Honoring request.");
terminate = EINA_TRUE;
}
static void
-_signal_handle_term(struct signalfd_siginfo *sinfo __UNUSED__)
+_signal_handle_term(struct signalfd_siginfo *sinfo EINA_UNUSED)
{
DBG("Received SIGTERM. Honoring request.");
terminate = EINA_TRUE;
}
static void
-_signalfd_handler(int fd, Fd_Flags flags __UNUSED__, void *data __UNUSED__)
+_signalfd_handler(int fd, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED)
{
struct signalfd_siginfo sinfo;
ssize_t ret;
@@ -180,7 +180,7 @@ _signalfd_finish(void)
}
static void
-_socketfd_handler(int fd __UNUSED__, Fd_Flags flags __UNUSED__, void *data __UNUSED__)
+_socketfd_handler(int fd EINA_UNUSED, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED)
{
struct sockaddr_un remote;
unsigned int len;
@@ -283,7 +283,7 @@ _socketfd_finish(void)
}
static void
-_inotifyfd_handler(int fd, Fd_Flags flags, void *data __UNUSED__)
+_inotifyfd_handler(int fd, Fd_Flags flags, void *data EINA_UNUSED)
{
char buffer[16384];
int i = 0;
diff --git a/legacy/evas/src/bin/evas_cserve2_messages.c b/src/bin/evas/evas_cserve2_messages.c
index 14a2bec14..e5cb1b7ee 100644
--- a/legacy/evas/src/bin/evas_cserve2_messages.c
+++ b/src/bin/evas/evas_cserve2_messages.c
@@ -67,7 +67,7 @@ _client_msg_read(Client *client, int done)
}
void
-cserve2_message_handler(int fd __UNUSED__, Fd_Flags flags, void *data)
+cserve2_message_handler(int fd EINA_UNUSED, Fd_Flags flags, void *data)
{
Client *client = data;
int len;
diff --git a/legacy/evas/src/bin/evas_cserve2_requests.c b/src/bin/evas/evas_cserve2_requests.c
index f155a224b..2fe540d1f 100644
--- a/legacy/evas/src/bin/evas_cserve2_requests.c
+++ b/src/bin/evas/evas_cserve2_requests.c
@@ -325,7 +325,7 @@ _cserve2_request_failed(Slave_Request *req, Error_Type type)
}
static void
-_slave_read_cb(Slave *s __UNUSED__, Slave_Command cmd, void *msg, void *data)
+_slave_read_cb(Slave *s EINA_UNUSED, Slave_Command cmd, void *msg, void *data)
{
Slave_Worker *sw = data;
Slave_Request *dep, *req = sw->data;
@@ -395,7 +395,7 @@ free_it:
}
static void
-_slave_dead_cb(Slave *s __UNUSED__, void *data)
+_slave_dead_cb(Slave *s EINA_UNUSED, void *data)
{
Slave_Worker *sw = data;
Slave_Request *req = sw->data;
diff --git a/legacy/evas/src/bin/evas_cserve2_shm.c b/src/bin/evas/evas_cserve2_shm.c
index 5e60138b4..5e60138b4 100644
--- a/legacy/evas/src/bin/evas_cserve2_shm.c
+++ b/src/bin/evas/evas_cserve2_shm.c
diff --git a/legacy/evas/src/bin/evas_cserve2_slave.c b/src/bin/evas/evas_cserve2_slave.c
index 317bc1441..317bc1441 100644
--- a/legacy/evas/src/bin/evas_cserve2_slave.c
+++ b/src/bin/evas/evas_cserve2_slave.c
diff --git a/legacy/evas/src/bin/evas_cserve2_slave.h b/src/bin/evas/evas_cserve2_slave.h
index a491b45d8..a491b45d8 100644
--- a/legacy/evas/src/bin/evas_cserve2_slave.h
+++ b/src/bin/evas/evas_cserve2_slave.h
diff --git a/legacy/evas/src/bin/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c
index 542a4fb4f..92f04e29e 100644
--- a/legacy/evas/src/bin/evas_cserve2_slaves.c
+++ b/src/bin/evas/evas_cserve2_slaves.c
@@ -124,7 +124,7 @@ _slave_thread_free(Slave_Thread *s)
}
static void
-_slave_proc_dead_cb(int pid, int status __UNUSED__)
+_slave_proc_dead_cb(int pid, int status EINA_UNUSED)
{
Slave_Proc *s;
@@ -167,7 +167,7 @@ _slave_write(Slave *s, const char *data, size_t size)
}
static void
-_slave_write_cb(int fd __UNUSED__, Fd_Flags flags __UNUSED__, void *data)
+_slave_write_cb(int fd EINA_UNUSED, Fd_Flags flags EINA_UNUSED, void *data)
{
Slave *s = data;
size_t sent;
diff --git a/legacy/evas/src/bin/evas_cserve2_usage.c b/src/bin/evas/evas_cserve2_usage.c
index 853e63345..853e63345 100644
--- a/legacy/evas/src/bin/evas_cserve2_usage.c
+++ b/src/bin/evas/evas_cserve2_usage.c
diff --git a/legacy/evas/src/bin/evas_cserve2_utils.c b/src/bin/evas/evas_cserve2_utils.c
index 68fa216e1..68fa216e1 100644
--- a/legacy/evas/src/bin/evas_cserve2_utils.c
+++ b/src/bin/evas/evas_cserve2_utils.c
diff --git a/legacy/evas/src/bin/loaders/bmp/evas_image_load_bmp.c b/src/bin/evas/loaders/bmp/evas_image_load_bmp.c
index 4a00547d0..4a117521f 100644
--- a/legacy/evas/src/bin/loaders/bmp/evas_image_load_bmp.c
+++ b/src/bin/evas/loaders/bmp/evas_image_load_bmp.c
@@ -91,7 +91,7 @@ read_mem(unsigned char *map, size_t length, size_t *position, void *buffer, int
}
static Eina_Bool
-evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
void *map = NULL;
@@ -368,7 +368,7 @@ evas_image_load_file_head_bmp(Evas_Img_Load_Params *ilp, const char *file, const
}
static Eina_Bool
-evas_image_load_file_data_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_bmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
void *map = NULL;
diff --git a/legacy/evas/src/bin/loaders/eet/evas_image_load_eet.c b/src/bin/evas/loaders/eet/evas_image_load_eet.c
index 1eee2e7a9..1eee2e7a9 100644
--- a/legacy/evas/src/bin/loaders/eet/evas_image_load_eet.c
+++ b/src/bin/evas/loaders/eet/evas_image_load_eet.c
diff --git a/legacy/evas/src/bin/loaders/ico/evas_image_load_ico.c b/src/bin/evas/loaders/ico/evas_image_load_ico.c
index 53c9b5229..53c9b5229 100644
--- a/legacy/evas/src/bin/loaders/ico/evas_image_load_ico.c
+++ b/src/bin/evas/loaders/ico/evas_image_load_ico.c
diff --git a/legacy/evas/src/bin/loaders/jpeg/evas_image_load_jpeg.c b/src/bin/evas/loaders/jpeg/evas_image_load_jpeg.c
index d1b1a7977..78fcc1f76 100644
--- a/legacy/evas/src/bin/loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/bin/evas/loaders/jpeg/evas_image_load_jpeg.c
@@ -35,7 +35,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo)
}
static void
-_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
+_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED)
{
/* emptr errmgr; */
@@ -46,7 +46,7 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
}
static void
-_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, int msg_level __UNUSED__)
+_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED, int msg_level EINA_UNUSED)
{
/* emptr errmgr; */
@@ -66,7 +66,7 @@ struct jpeg_membuf_src
};
static void
-_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo __UNUSED__)
+_evas_jpeg_membuf_src_init(j_decompress_ptr cinfo EINA_UNUSED)
{
}
@@ -1031,7 +1031,7 @@ done:
Eina_Bool
evas_image_load_file_head_jpeg(Evas_Img_Load_Params *ilp,
- const char *file, const char *key __UNUSED__,
+ const char *file, const char *key EINA_UNUSED,
int *error)
{
Eina_File *f;
@@ -1064,7 +1064,7 @@ evas_image_load_file_head_jpeg(Evas_Img_Load_Params *ilp,
static Eina_Bool
evas_image_load_file_data_jpeg(Evas_Img_Load_Params *ilp,
- const char *file, const char *key __UNUSED__,
+ const char *file, const char *key EINA_UNUSED,
int *error)
{
Eina_File *f;
diff --git a/legacy/evas/src/bin/loaders/pmaps/evas_image_load_pmaps.c b/src/bin/evas/loaders/pmaps/evas_image_load_pmaps.c
index 20f740ee7..83b931001 100644
--- a/legacy/evas/src/bin/loaders/pmaps/evas_image_load_pmaps.c
+++ b/src/bin/evas/loaders/pmaps/evas_image_load_pmaps.c
@@ -60,7 +60,7 @@ static size_t pmaps_buffer_raw_update(Pmaps_Buffer *b);
static int pmaps_buffer_comment_skip(Pmaps_Buffer *b);
static Eina_Bool
-evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Pmaps_Buffer b;
@@ -85,7 +85,7 @@ evas_image_load_file_head_pmaps(Evas_Img_Load_Params *ilp, const char *file, con
}
static Eina_Bool
-evas_image_load_file_data_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_pmaps(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Pmaps_Buffer b;
int pixels;
diff --git a/legacy/evas/src/bin/loaders/png/evas_image_load_png.c b/src/bin/evas/loaders/png/evas_image_load_png.c
index 544fc6bad..24e1ec2d5 100644
--- a/legacy/evas/src/bin/loaders/png/evas_image_load_png.c
+++ b/src/bin/evas/loaders/png/evas_image_load_png.c
@@ -29,7 +29,7 @@
static Eina_Bool
-evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
png_uint_32 w32, h32;
FILE *f;
@@ -127,7 +127,7 @@ evas_image_load_file_head_png(Evas_Img_Load_Params *ilp, const char *file, const
}
static Eina_Bool
-evas_image_load_file_data_png(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_png(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
unsigned char *surface;
png_uint_32 w32, h32;
diff --git a/legacy/evas/src/bin/loaders/psd/evas_image_load_psd.c b/src/bin/evas/loaders/psd/evas_image_load_psd.c
index 30a31179f..29f1c1975 100644
--- a/legacy/evas/src/bin/loaders/psd/evas_image_load_psd.c
+++ b/src/bin/evas/loaders/psd/evas_image_load_psd.c
@@ -153,7 +153,7 @@ is_psd(PSD_Header *header)
static Eina_Bool
evas_image_load_file_head_psd(Evas_Img_Load_Params *ilp, const char *FileName,
- const char *key __UNUSED__, int *error)
+ const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
void *map;
@@ -201,7 +201,7 @@ evas_image_load_file_head_psd(Evas_Img_Load_Params *ilp, const char *FileName,
static unsigned int
read_compressed_channel(const unsigned char *map, size_t length, size_t *position,
- const unsigned int channel_length __UNUSED__,
+ const unsigned int channel_length EINA_UNUSED,
unsigned int size,
unsigned char* channel)
{
@@ -865,7 +865,7 @@ read_psd_cmyk(Evas_Img_Load_Params *ilp, PSD_Header *head, const unsigned char *
static Eina_Bool
evas_image_load_file_data_psd(Evas_Img_Load_Params *ilp,
const char *file,
- const char *key __UNUSED__,
+ const char *key EINA_UNUSED,
int *error)
{
Eina_File *f;
diff --git a/legacy/evas/src/bin/loaders/tga/evas_image_load_tga.c b/src/bin/evas/loaders/tga/evas_image_load_tga.c
index 4c7d5f1e6..b9dda06fc 100644
--- a/legacy/evas/src/bin/loaders/tga/evas_image_load_tga.c
+++ b/src/bin/evas/loaders/tga/evas_image_load_tga.c
@@ -60,7 +60,7 @@ struct _tga_footer
static Eina_Bool
-evas_image_load_file_head_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
unsigned char *seg = NULL, *filedata;
@@ -159,7 +159,7 @@ close_file:
}
static Eina_Bool
-evas_image_load_file_data_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_tga(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
unsigned char *seg = NULL, *filedata;
diff --git a/legacy/evas/src/bin/loaders/tiff/evas_image_load_tiff.c b/src/bin/evas/loaders/tiff/evas_image_load_tiff.c
index e48e72f48..23e927ddd 100644
--- a/legacy/evas/src/bin/loaders/tiff/evas_image_load_tiff.c
+++ b/src/bin/evas/loaders/tiff/evas_image_load_tiff.c
@@ -26,7 +26,7 @@ struct TIFFRGBAImage_Extra {
};
static Eina_Bool
-evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
char txt[1024];
TIFFRGBAImage tiff_image;
@@ -109,7 +109,7 @@ evas_image_load_file_head_tiff(Evas_Img_Load_Params *ilp, const char *file, cons
}
static Eina_Bool
-evas_image_load_file_data_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_tiff(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
char txt[1024];
TIFFRGBAImage_Extra rgba_image;
diff --git a/legacy/evas/src/bin/loaders/wbmp/evas_image_load_wbmp.c b/src/bin/evas/loaders/wbmp/evas_image_load_wbmp.c
index 6c34aa63d..e8a41a0ee 100644
--- a/legacy/evas/src/bin/loaders/wbmp/evas_image_load_wbmp.c
+++ b/src/bin/evas/loaders/wbmp/evas_image_load_wbmp.c
@@ -32,7 +32,7 @@ read_mb(unsigned int *data, void *map, size_t length, size_t *position)
}
static Eina_Bool
-evas_image_load_file_head_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
void *map = NULL;
@@ -86,7 +86,7 @@ bail:
}
static Eina_Bool
-evas_image_load_file_data_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_wbmp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
Eina_File *f;
void *map = NULL;
diff --git a/legacy/evas/src/bin/loaders/webp/evas_image_load_webp.c b/src/bin/evas/loaders/webp/evas_image_load_webp.c
index 125c58154..c0c89d3f4 100644
--- a/legacy/evas/src/bin/loaders/webp/evas_image_load_webp.c
+++ b/src/bin/evas/loaders/webp/evas_image_load_webp.c
@@ -16,7 +16,7 @@
static Eina_Bool
-evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
WebPDecoderConfig config;
FILE *f;
@@ -57,7 +57,7 @@ evas_image_load_file_head_webp(Evas_Img_Load_Params *ilp, const char *file, cons
}
static Eina_Bool
-evas_image_load_file_data_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int *error)
+evas_image_load_file_data_webp(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int *error)
{
FILE *f;
size_t file_size;
diff --git a/legacy/evas/src/bin/loaders/xpm/evas_image_load_xpm.c b/src/bin/evas/loaders/xpm/evas_image_load_xpm.c
index 18eb1277a..e8f52bb78 100644
--- a/legacy/evas/src/bin/loaders/xpm/evas_image_load_xpm.c
+++ b/src/bin/evas/loaders/xpm/evas_image_load_xpm.c
@@ -111,7 +111,7 @@ struct _CMap {
};
Eina_Rbtree_Direction
-_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data __UNUSED__)
+_cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data EINA_UNUSED)
{
CMap *lcm;
CMap *rcm;
@@ -125,7 +125,7 @@ _cmap_cmp_node_cb(const Eina_Rbtree *left, const Eina_Rbtree *right, void *data
}
int
-_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__, void *data __UNUSED__)
+_cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length EINA_UNUSED, void *data EINA_UNUSED)
{
CMap *root = EINA_RBTREE_CONTAINER_GET(node, CMap);
@@ -134,7 +134,7 @@ _cmap_cmp_key_cb(const Eina_Rbtree *node, const void *key, int length __UNUSED__
/** FIXME: clean this up and make more efficient **/
static Eina_Bool
-evas_image_load_file_xpm(Evas_Img_Load_Params *ilp, const char *file, const char *key __UNUSED__, int load_data, int *error)
+evas_image_load_file_xpm(Evas_Img_Load_Params *ilp, const char *file, const char *key EINA_UNUSED, int load_data, int *error)
{
DATA32 *ptr, *end;
Eina_File *f;
diff --git a/legacy/evas/src/lib/Evas.h b/src/lib/evas/Evas.h
index e964e7557..e964e7557 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/src/lib/evas/Evas.h
diff --git a/legacy/evas/src/lib/Evas_GL.h b/src/lib/evas/Evas_GL.h
index e3a4e331d..e3a4e331d 100644
--- a/legacy/evas/src/lib/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
diff --git a/legacy/evas/src/lib/cache/evas_cache.h b/src/lib/evas/cache/evas_cache.h
index 474f64e6e..474f64e6e 100644
--- a/legacy/evas/src/lib/cache/evas_cache.h
+++ b/src/lib/evas/cache/evas_cache.h
diff --git a/legacy/evas/src/lib/cache/evas_cache_engine_image.c b/src/lib/evas/cache/evas_cache_engine_image.c
index 5ec1af2e0..a7a9905e9 100644
--- a/legacy/evas/src/lib/cache/evas_cache_engine_image.c
+++ b/src/lib/evas/cache/evas_cache_engine_image.c
@@ -239,7 +239,7 @@ evas_cache_engine_image_dup(const Evas_Cache_Engine_Image_Func *cb, Evas_Cache_E
}
static Eina_Bool
-_evas_cache_engine_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
+_evas_cache_engine_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata)
{
Eina_List **delete_list = fdata;
diff --git a/legacy/evas/src/lib/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index a8bafd764..681e6af43 100644
--- a/legacy/evas/src/lib/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -490,7 +490,7 @@ evas_cache_image_init(const Evas_Cache_Image_Func *cb)
}
static Eina_Bool
-_evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
+_evas_cache_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata)
{
Eina_List **delete_list = fdata;
*delete_list = eina_list_prepend(*delete_list, data);
@@ -1022,7 +1022,7 @@ evas_cache_image_unload_data(Image_Entry *im)
}
static Eina_Bool
-_evas_cache_image_unload_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, __UNUSED__ void *fdata)
+_evas_cache_image_unload_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, EINA_UNUSED void *fdata)
{
evas_cache_image_unload_data(data);
return EINA_TRUE;
@@ -1084,7 +1084,7 @@ _dump_img(Image_Entry *im, const char *type)
}
static Eina_Bool
-_dump_cache_active(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata __UNUSED__)
+_dump_cache_active(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata EINA_UNUSED)
{
Image_Entry *im = data;
_dump_img(im, "ACTIVE");
diff --git a/legacy/evas/src/lib/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c
index a9c79f3d9..6be56eee2 100644
--- a/legacy/evas/src/lib/cache/evas_preload.c
+++ b/src/lib/evas/cache/evas_preload.c
@@ -51,7 +51,7 @@ _evas_preload_thread_end(void *data)
}
static void
-_evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNUSED__, void *event_info)
+_evas_preload_thread_done(void *target EINA_UNUSED, Evas_Callback_Type type EINA_UNUSED, void *event_info)
{
Evas_Preload_Pthread_Worker *work = event_info;
if (work->cancel)
@@ -65,7 +65,7 @@ _evas_preload_thread_done(void *target __UNUSED__, Evas_Callback_Type type __UNU
}
static void *
-_evas_preload_thread_worker(void *data, Eina_Thread thread __UNUSED__)
+_evas_preload_thread_worker(void *data, Eina_Thread thread EINA_UNUSED)
{
Evas_Preload_Pthread_Data *pth = data;
Evas_Preload_Pthread_Worker *work;
diff --git a/legacy/evas/src/lib/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c
index 0a65fa0a5..1b9d05cbd 100644
--- a/legacy/evas/src/lib/cache2/evas_cache2.c
+++ b/src/lib/evas/cache2/evas_cache2.c
@@ -489,7 +489,7 @@ evas_cache2_init(const Evas_Cache2_Image_Func *cb)
}
static Eina_Bool
-_evas_cache_image_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, void *fdata)
+_evas_cache_image_free_cb(EINA_UNUSED const Eina_Hash *hash, EINA_UNUSED const void *key, void *data, void *fdata)
{
Eina_List **delete_list = fdata;
*delete_list = eina_list_prepend(*delete_list, data);
diff --git a/legacy/evas/src/lib/cache2/evas_cache2.h b/src/lib/evas/cache2/evas_cache2.h
index 7028338e7..7028338e7 100644
--- a/legacy/evas/src/lib/cache2/evas_cache2.h
+++ b/src/lib/evas/cache2/evas_cache2.h
diff --git a/legacy/evas/src/lib/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index 0246138f3..0246138f3 100644
--- a/legacy/evas/src/lib/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
diff --git a/legacy/evas/src/lib/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c
index c8f114e48..c8f114e48 100644
--- a/legacy/evas/src/lib/canvas/evas_async_events.c
+++ b/src/lib/evas/canvas/evas_async_events.c
diff --git a/legacy/evas/src/lib/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index faf84455e..faf84455e 100644
--- a/legacy/evas/src/lib/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
diff --git a/legacy/evas/src/lib/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 7a6927757..7a6927757 100644
--- a/legacy/evas/src/lib/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
diff --git a/legacy/evas/src/lib/canvas/evas_common_interface.c b/src/lib/evas/canvas/evas_common_interface.c
index 8f16d5ae7..8f16d5ae7 100644
--- a/legacy/evas/src/lib/canvas/evas_common_interface.c
+++ b/src/lib/evas/canvas/evas_common_interface.c
diff --git a/legacy/evas/src/lib/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index 1d1d69829..1d1d69829 100644
--- a/legacy/evas/src/lib/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
diff --git a/legacy/evas/src/lib/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 8569bd5d0..8569bd5d0 100644
--- a/legacy/evas/src/lib/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 36e966086..36e966086 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
diff --git a/legacy/evas/src/lib/canvas/evas_filter.c b/src/lib/evas/canvas/evas_filter.c
index 953aea1c2..80a11b431 100644
--- a/legacy/evas/src/lib/canvas/evas_filter.c
+++ b/src/lib/evas/canvas/evas_filter.c
@@ -475,31 +475,31 @@ evas_object_filter_param_int_get(Evas_Object *o, const char *param)
}
EAPI Eina_Bool
-evas_object_filter_param_str_set(Evas_Object *o __UNUSED__,
- const char *param __UNUSED__,
- const char *val __UNUSED__)
+evas_object_filter_param_str_set(Evas_Object *o EINA_UNUSED,
+ const char *param EINA_UNUSED,
+ const char *val EINA_UNUSED)
{
return EINA_FALSE;
}
EAPI const char *
-evas_object_filter_param_str_get(Evas_Object *o __UNUSED__,
- const char *param __UNUSED__)
+evas_object_filter_param_str_get(Evas_Object *o EINA_UNUSED,
+ const char *param EINA_UNUSED)
{
return NULL;
}
EAPI Eina_Bool
-evas_object_filter_param_obj_set(Evas_Object *o __UNUSED__,
- const char *param __UNUSED__,
- Evas_Object *val __UNUSED__)
+evas_object_filter_param_obj_set(Evas_Object *o EINA_UNUSED,
+ const char *param EINA_UNUSED,
+ Evas_Object *val EINA_UNUSED)
{
return EINA_FALSE;
}
EAPI Evas_Object *
-evas_object_filter_param_obj_get(Evas_Object *o __UNUSED__,
- const char *param __UNUSED__)
+evas_object_filter_param_obj_get(Evas_Object *o EINA_UNUSED,
+ const char *param EINA_UNUSED)
{
return NULL;
}
@@ -1241,7 +1241,7 @@ negation_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
}
static Eina_Bool
-sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
+sepia_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst)
{
uint32_t *in, *out;
int i, j;
@@ -1278,7 +1278,7 @@ sepia_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst
}
static Eina_Bool
-greyscale_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
+greyscale_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst)
{
uint32_t *in, *out;
int i, j;
@@ -1399,7 +1399,7 @@ brightness_filter(Evas_Filter_Info *info, RGBA_Image *src, RGBA_Image *dst)
}
static Eina_Bool
-contrast_filter(Evas_Filter_Info *info __UNUSED__, RGBA_Image *src, RGBA_Image *dst)
+contrast_filter(Evas_Filter_Info *info EINA_UNUSED, RGBA_Image *src, RGBA_Image *dst)
{
uint32_t *in, *out;
int i, j;
diff --git a/legacy/evas/src/lib/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index 0e1914d78..0e1914d78 100644
--- a/legacy/evas/src/lib/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index 5a19a08fb..b35627aae 100644
--- a/legacy/evas/src/lib/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -875,7 +875,7 @@ evas_font_dir_available_list_free(Eina_List *available)
/* private stuff */
static Eina_Bool
-font_cache_dir_free(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata __UNUSED__)
+font_cache_dir_free(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data, void *fdata EINA_UNUSED)
{
object_text_font_cache_dir_del((char *) key, data);
return 1;
@@ -1154,7 +1154,7 @@ object_text_font_cache_dir_add(char *dir)
}
static void
-object_text_font_cache_dir_del(char *dir __UNUSED__, Evas_Font_Dir *fd)
+object_text_font_cache_dir_del(char *dir EINA_UNUSED, Evas_Font_Dir *fd)
{
if (fd->lookup) eina_hash_free(fd->lookup);
while (fd->fonts)
diff --git a/legacy/evas/src/lib/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c
index faf5280a8..faf5280a8 100644
--- a/legacy/evas/src/lib/canvas/evas_gl.c
+++ b/src/lib/evas/canvas/evas_gl.c
diff --git a/legacy/evas/src/lib/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c
index aef0fc4da..aef0fc4da 100644
--- a/legacy/evas/src/lib/canvas/evas_key.c
+++ b/src/lib/evas/canvas/evas_key.c
diff --git a/legacy/evas/src/lib/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 85e1761b3..85e1761b3 100644
--- a/legacy/evas/src/lib/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index fa86aa933..fa86aa933 100644
--- a/legacy/evas/src/lib/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 9fc8aab0a..9fc8aab0a 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
diff --git a/legacy/evas/src/lib/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 3338d3704..3338d3704 100644
--- a/legacy/evas/src/lib/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
diff --git a/legacy/evas/src/lib/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 5e2d92eed..5e2d92eed 100644
--- a/legacy/evas/src/lib/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index b48693545..2cc4597a6 100644
--- a/legacy/evas/src/lib/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -116,7 +116,7 @@ _evas_object_box_accessor_free(Evas_Object_Box_Accessor *it)
}
static void
-_on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__)
+_on_child_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *einfo EINA_UNUSED)
{
Evas_Object *box = data;
EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
@@ -124,7 +124,7 @@ _on_child_resize(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, v
}
static void
-_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __UNUSED__)
+_on_child_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *o, void *einfo EINA_UNUSED)
{
Evas_Object *box = data;
@@ -136,7 +136,7 @@ _on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *o, void *einfo __U
}
static void
-_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUSED__, void *einfo __UNUSED__)
+_on_child_hints_changed(void *data, Evas *evas EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *einfo EINA_UNUSED)
{
Evas_Object *box = data;
EVAS_OBJECT_BOX_DATA_GET_OR_RETURN(box, priv);
@@ -147,7 +147,7 @@ _on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *o __UNUS
}
static void
-_on_hints_changed(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *o , void *einfo __UNUSED__)
+_on_hints_changed(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *o , void *einfo EINA_UNUSED)
{
_sizing_eval(o);
}
diff --git a/legacy/evas/src/lib/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 7a440cb26..7a440cb26 100644
--- a/legacy/evas/src/lib/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index ad5dd46c7..f71f0e7ca 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1,10 +1,10 @@
#ifdef HAVE_CONFIG_H
-# include "config.h" /* so that EAPI in Evas.h is correctly defined */
+# include "config.h"
#endif
+#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <stdlib.h>
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
@@ -12,9 +12,9 @@
#include "evas_common.h"
#include "evas_private.h"
-#include "../engines/common/evas_convert_color.h"
-#include "../engines/common/evas_convert_colorspace.h"
-#include "../engines/common/evas_convert_yuv.h"
+#include "../common/evas_convert_color.h"
+#include "../common/evas_convert_colorspace.h"
+#include "../common/evas_convert_yuv.h"
#include <Eo.h>
@@ -4308,7 +4308,7 @@ evas_object_image_get_opaque_rect(Evas_Object *eo_obj, Evas_Object_Protected_Dat
}
static int
-evas_object_image_can_map(Evas_Object *obj __UNUSED__)
+evas_object_image_can_map(Evas_Object *obj EINA_UNUSED)
{
return 1;
}
@@ -4372,7 +4372,7 @@ evas_object_image_data_convert_internal(Evas_Object_Image *o, void *data, Evas_C
}
static void
-evas_object_image_filled_resize_listener(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *einfo __UNUSED__)
+evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *einfo EINA_UNUSED)
{
Evas_Coord w, h;
diff --git a/legacy/evas/src/lib/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index 848012d98..848012d98 100644
--- a/legacy/evas/src/lib/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index 4c31cd862..4c31cd862 100644
--- a/legacy/evas/src/lib/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 76a6263d8..76a6263d8 100644
--- a/legacy/evas/src/lib/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8c80eae0c..8c80eae0c 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index 475c55519..475c55519 100644
--- a/legacy/evas/src/lib/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index a90aeb77b..a90aeb77b 100644
--- a/legacy/evas/src/lib/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 9502aef7a..9502aef7a 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 3263b751e..3263b751e 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
diff --git a/legacy/evas/src/lib/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index da5550d84..6bf5c4728 100644
--- a/legacy/evas/src/lib/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -246,14 +246,14 @@ _evas_object_table_option_del(Evas_Object *o)
}
static void
-_on_child_del(void *data, Evas *evas __UNUSED__, Evas_Object *child, void *einfo __UNUSED__)
+_on_child_del(void *data, Evas *evas EINA_UNUSED, Evas_Object *child, void *einfo EINA_UNUSED)
{
Evas_Object *table = data;
evas_object_table_unpack(table, child);
}
static void
-_on_child_hints_changed(void *data, Evas *evas __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__)
+_on_child_hints_changed(void *data, Evas *evas EINA_UNUSED, Evas_Object *child EINA_UNUSED, void *einfo EINA_UNUSED)
{
Evas_Object *table = data;
EVAS_OBJECT_TABLE_DATA_GET_OR_RETURN(table, priv);
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 027954444..b69798e17 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -261,7 +261,7 @@ _evas_object_text_horiz_advance_get(const Evas_Object *eo_obj,
}
static Evas_Coord
-_evas_object_text_vert_advance_get(const Evas_Object *obj __UNUSED__,
+_evas_object_text_vert_advance_get(const Evas_Object *obj EINA_UNUSED,
const Evas_Object_Text *o)
{
return o->max_ascent + o->max_descent;
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index a9c0acc22..7246d41ec 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -2088,7 +2088,7 @@ _layout_update_bidi_props(const Evas_Object_Textblock *o,
* Free the visual lines in the paragraph (logical items are kept)
*/
static void
-_paragraph_clear(const Evas_Object *obj __UNUSED__,
+_paragraph_clear(const Evas_Object *obj EINA_UNUSED,
Evas_Object_Textblock_Paragraph *par)
{
while (par->lines)
@@ -2655,7 +2655,7 @@ _layout_line_advance(Ctxt *c, Evas_Object_Textblock_Format *fmt)
* @param len the length of the string.
*/
static Evas_Object_Textblock_Text_Item *
-_layout_text_item_new(Ctxt *c __UNUSED__, Evas_Object_Textblock_Format *fmt)
+_layout_text_item_new(Ctxt *c EINA_UNUSED, Evas_Object_Textblock_Format *fmt)
{
Evas_Object_Textblock_Text_Item *ti;
@@ -3142,7 +3142,7 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt)
* @param create_item Create a new format item if true, only process otherwise.
*/
static void
-_layout_do_format(const Evas_Object *obj __UNUSED__, Ctxt *c,
+_layout_do_format(const Evas_Object *obj EINA_UNUSED, Ctxt *c,
Evas_Object_Textblock_Format **_fmt, Evas_Object_Textblock_Node_Format *n,
int *style_pad_l, int *style_pad_r, int *style_pad_t, int *style_pad_b,
Eina_Bool create_item)
diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 9ba96ed44..c5a651b50 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -878,7 +878,7 @@ evas_object_textgrid_engine_data_get(Evas_Object *eo_obj)
}
static int
-evas_object_textgrid_is_opaque(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj EINA_UNUSED)
+evas_object_textgrid_is_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
{
/* this returns 1 if the internal object data implies that the object is
currently fully opaque over the entire gradient it occupies */
@@ -886,7 +886,7 @@ evas_object_textgrid_is_opaque(Evas_Object *eo_obj __UNUSED__, Evas_Object_Prote
}
static int
-evas_object_textgrid_was_opaque(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj EINA_UNUSED)
+evas_object_textgrid_was_opaque(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
{
/* this returns 1 if the internal object data implies that the object was
currently fully opaque over the entire gradient it occupies */
diff --git a/legacy/evas/src/lib/canvas/evas_rectangle.c b/src/lib/evas/canvas/evas_rectangle.c
index da6b70162..da6b70162 100644
--- a/legacy/evas/src/lib/canvas/evas_rectangle.c
+++ b/src/lib/evas/canvas/evas_rectangle.c
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 9762dda94..9762dda94 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
diff --git a/legacy/evas/src/lib/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c
index f39721dd0..f39721dd0 100644
--- a/legacy/evas/src/lib/canvas/evas_smart.c
+++ b/src/lib/evas/canvas/evas_smart.c
diff --git a/legacy/evas/src/lib/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index eaae5030e..eaae5030e 100644
--- a/legacy/evas/src/lib/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
diff --git a/legacy/evas/src/lib/canvas/evas_stats.c b/src/lib/evas/canvas/evas_stats.c
index 3e057d06f..ba6f8ac4d 100644
--- a/legacy/evas/src/lib/canvas/evas_stats.c
+++ b/src/lib/evas/canvas/evas_stats.c
@@ -15,30 +15,30 @@ evas_cserve_connected_get(void)
}
EAPI Eina_Bool
-evas_cserve_stats_get(Evas_Cserve_Stats *stats __UNUSED__)
+evas_cserve_stats_get(Evas_Cserve_Stats *stats EINA_UNUSED)
{
return 0;
}
EAPI Eina_Bool
-evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache __UNUSED__)
+evas_cserve_image_cache_contents_get(Evas_Cserve_Image_Cache *cache EINA_UNUSED)
{
return 0;
}
EAPI void
-evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache __UNUSED__)
+evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache EINA_UNUSED)
{
}
EAPI Eina_Bool
-evas_cserve_config_get(Evas_Cserve_Config *config __UNUSED__)
+evas_cserve_config_get(Evas_Cserve_Config *config EINA_UNUSED)
{
return 0;
}
EAPI Eina_Bool
-evas_cserve_config_set(const Evas_Cserve_Config *config __UNUSED__)
+evas_cserve_config_set(const Evas_Cserve_Config *config EINA_UNUSED)
{
return 0;
}
diff --git a/legacy/evas/src/lib/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c
index 603756a2f..603756a2f 100644
--- a/legacy/evas/src/lib/canvas/evas_touch_point.c
+++ b/src/lib/evas/canvas/evas_touch_point.c
diff --git a/legacy/evas/src/lib/engines/common/evas_blend.h b/src/lib/evas/common/evas_blend.h
index 1a98f3f55..1a98f3f55 100644
--- a/legacy/evas/src/lib/engines/common/evas_blend.h
+++ b/src/lib/evas/common/evas_blend.h
diff --git a/legacy/evas/src/lib/engines/common/evas_blend_main.c b/src/lib/evas/common/evas_blend_main.c
index dcc0f4c94..d37d88876 100644
--- a/legacy/evas/src/lib/engines/common/evas_blend_main.c
+++ b/src/lib/evas/common/evas_blend_main.c
@@ -9,12 +9,12 @@ const DATA32 ALPHA_255 = 255;
const DATA32 ALPHA_256 = 256;
static void
-_composite_span_nothing(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d __UNUSED__, int l __UNUSED__)
+_composite_span_nothing(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d EINA_UNUSED, int l EINA_UNUSED)
{
}
static void
-_composite_pt_nothing(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d __UNUSED__)
+_composite_pt_nothing(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d EINA_UNUSED)
{
}
diff --git a/legacy/evas/src/lib/engines/common/evas_blend_private.h b/src/lib/evas/common/evas_blend_private.h
index 1d14951da..1d14951da 100644
--- a/legacy/evas/src/lib/engines/common/evas_blend_private.h
+++ b/src/lib/evas/common/evas_blend_private.h
diff --git a/legacy/evas/src/lib/engines/common/evas_blit_main.c b/src/lib/evas/common/evas_blit_main.c
index bed6d01dc..bed6d01dc 100644
--- a/legacy/evas/src/lib/engines/common/evas_blit_main.c
+++ b/src/lib/evas/common/evas_blit_main.c
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_color.c b/src/lib/evas/common/evas_convert_color.c
index 70a9e9041..70a9e9041 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_color.c
+++ b/src/lib/evas/common/evas_convert_color.c
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_color.h b/src/lib/evas/common/evas_convert_color.h
index 0224879ed..0224879ed 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_color.h
+++ b/src/lib/evas/common/evas_convert_color.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c b/src/lib/evas/common/evas_convert_colorspace.c
index 013c2e789..49b066c1c 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.c
+++ b/src/lib/evas/common/evas_convert_colorspace.c
@@ -13,7 +13,7 @@
static inline void *
-evas_common_convert_argb8888_to_rgb565_a5p(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__, int stride __UNUSED__, Eina_Bool has_alpha __UNUSED__)
+evas_common_convert_argb8888_to_rgb565_a5p(void *data EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int stride EINA_UNUSED, Eina_Bool has_alpha EINA_UNUSED)
{
return NULL;
}
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h b/src/lib/evas/common/evas_convert_colorspace.h
index f3bec7862..f3bec7862 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_colorspace.h
+++ b/src/lib/evas/common/evas_convert_colorspace.h
diff --git a/src/lib/evas/common/evas_convert_gry_1.c b/src/lib/evas/common/evas_convert_gry_1.c
new file mode 100644
index 000000000..df12ea6fa
--- /dev/null
+++ b/src/lib/evas/common/evas_convert_gry_1.c
@@ -0,0 +1,6 @@
+#include "evas_common.h"
+#include "evas_convert_gry_1.h"
+
+void evas_common_convert_rgba_to_1bpp_gry_1_dith(DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
+{
+}
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.h b/src/lib/evas/common/evas_convert_gry_1.h
index 38d67763c..38d67763c 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.h
+++ b/src/lib/evas/common/evas_convert_gry_1.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c b/src/lib/evas/common/evas_convert_gry_8.c
index bf45fd7a4..072a7dc72 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c
+++ b/src/lib/evas/common/evas_convert_gry_8.c
@@ -8,7 +8,7 @@ extern const DATA8 _evas_dither_44[4][4];
extern const DATA8 _evas_dither_128128[128][128];
#endif
-void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA8 *dst_ptr;
@@ -32,9 +32,9 @@ void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst,
CONVERT_LOOP_END_ROT_0();
}
-void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){}
+void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED){}
-void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal __UNUSED__)
+void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA8 *dst_ptr;
@@ -63,6 +63,6 @@ void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst,
CONVERT_LOOP_END_ROT_0();
}
-void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){}
+void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED){}
-void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){}
+void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED){}
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.h b/src/lib/evas/common/evas_convert_gry_8.h
index d70f59d63..d70f59d63 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.h
+++ b/src/lib/evas/common/evas_convert_gry_8.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c b/src/lib/evas/common/evas_convert_grypal_6.c
index c2acef7d0..243bf000e 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c
+++ b/src/lib/evas/common/evas_convert_grypal_6.c
@@ -1,7 +1,7 @@
#include "evas_common.h"
#include "evas_convert_grypal_6.h"
-void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal)
+void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal)
{
DATA32 *src_ptr;
DATA8 *dst_ptr;
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.h b/src/lib/evas/common/evas_convert_grypal_6.h
index 5f839c2bc..5f839c2bc 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.h
+++ b/src/lib/evas/common/evas_convert_grypal_6.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.c b/src/lib/evas/common/evas_convert_main.c
index 39e6d6c06..2be2aa27e 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_main.c
+++ b/src/lib/evas/common/evas_convert_main.c
@@ -157,7 +157,7 @@ evas_common_convert_init(void)
}
EAPI Gfx_Func_Convert
-evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation)
+evas_common_convert_func_get(DATA8 *dest, int w, int h EINA_UNUSED, int depth, DATA32 rmask, DATA32 gmask, DATA32 bmask, Convert_Pal_Mode pal_mode, int rotation)
{
if ((rmask == 0) && (gmask == 0) && (bmask == 0))
{
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.h b/src/lib/evas/common/evas_convert_main.h
index 51c2cc888..51c2cc888 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_main.h
+++ b/src/lib/evas/common/evas_convert_main.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c b/src/lib/evas/common/evas_convert_rgb_16.c
index d7a4f492f..d7a4f492f 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
+++ b/src/lib/evas/common/evas_convert_rgb_16.c
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.h b/src/lib/evas/common/evas_convert_rgb_16.h
index f7ae63c26..f7ae63c26 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.h
+++ b/src/lib/evas/common/evas_convert_rgb_16.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c b/src/lib/evas/common/evas_convert_rgb_24.c
index 1d4f091c2..88f364803 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c
+++ b/src/lib/evas/common/evas_convert_rgb_24.c
@@ -2,7 +2,7 @@
#include "evas_convert_rgb_24.h"
void
-evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA8 *dst_ptr;
@@ -28,7 +28,7 @@ evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump,
}
void
-evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA8 *dst_ptr, *scratch_ptr;
@@ -59,7 +59,7 @@ evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump,
}
void
-evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA8 *dst_ptr;
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.h b/src/lib/evas/common/evas_convert_rgb_24.h
index bc114cad9..bc114cad9 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.h
+++ b/src/lib/evas/common/evas_convert_rgb_24.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c b/src/lib/evas/common/evas_convert_rgb_32.c
index 17d686b58..b7652269c 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c
+++ b/src/lib/evas/common/evas_convert_rgb_32.c
@@ -2,7 +2,7 @@
#include "evas_convert_rgb_32.h"
void
-evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -24,7 +24,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jum
}
void
-evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -189,7 +189,7 @@ FAST_SIMPLE_ROTATE(8888, DATA32)
#endif
void
-evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
#ifdef TILE_ROTATE
blt_rotated_270_8888((DATA8 *)dst, dst_jump+w, (const DATA8 *)src, src_jump+h, w, h) ;
@@ -210,7 +210,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
# ifndef BUILD_NEON
# ifdef TILE_ROTATE
@@ -328,7 +328,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -346,7 +346,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_ju
}
void
-evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -364,7 +364,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, in
}
void
-evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -382,7 +382,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, in
}
void
-evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -400,7 +400,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -417,7 +417,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jum
}
void
-evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -434,7 +434,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -451,7 +451,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -468,7 +468,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -485,7 +485,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_ju
}
void
-evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -502,7 +502,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, in
}
void
-evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -519,7 +519,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, in
}
void
-evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
@@ -536,7 +536,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int
}
void
-evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__)
+evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
{
DATA32 *src_ptr;
DATA32 *dst_ptr;
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.h b/src/lib/evas/common/evas_convert_rgb_32.h
index 75595c7ef..75595c7ef 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.h
+++ b/src/lib/evas/common/evas_convert_rgb_32.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c b/src/lib/evas/common/evas_convert_rgb_8.c
index 7ae0e86fd..7ae0e86fd 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c
+++ b/src/lib/evas/common/evas_convert_rgb_8.c
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.h b/src/lib/evas/common/evas_convert_rgb_8.h
index edb3a89fd..edb3a89fd 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.h
+++ b/src/lib/evas/common/evas_convert_rgb_8.h
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_yuv.c b/src/lib/evas/common/evas_convert_yuv.c
index 0b6aa6a00..0b6aa6a00 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_yuv.c
+++ b/src/lib/evas/common/evas_convert_yuv.c
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_yuv.h b/src/lib/evas/common/evas_convert_yuv.h
index b59880717..b59880717 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_yuv.h
+++ b/src/lib/evas/common/evas_convert_yuv.h
diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/src/lib/evas/common/evas_cpu.c
index 33229ff1a..040589e86 100644
--- a/legacy/evas/src/lib/engines/common/evas_cpu.c
+++ b/src/lib/evas/common/evas_cpu.c
@@ -21,13 +21,13 @@ static void evas_common_cpu_catch_ill(int sig);
static void evas_common_cpu_catch_segv(int sig);
static void
-evas_common_cpu_catch_ill(int sig __UNUSED__)
+evas_common_cpu_catch_ill(int sig EINA_UNUSED)
{
siglongjmp(detect_buf, 1);
}
static void
-evas_common_cpu_catch_segv(int sig __UNUSED__)
+evas_common_cpu_catch_segv(int sig EINA_UNUSED)
{
siglongjmp(detect_buf, 1);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_draw.h b/src/lib/evas/common/evas_draw.h
index 6599d54c0..6599d54c0 100644
--- a/legacy/evas/src/lib/engines/common/evas_draw.h
+++ b/src/lib/evas/common/evas_draw.h
diff --git a/legacy/evas/src/lib/engines/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c
index 28b54cd0a..28b54cd0a 100644
--- a/legacy/evas/src/lib/engines/common/evas_draw_main.c
+++ b/src/lib/evas/common/evas_draw_main.c
diff --git a/legacy/evas/src/lib/engines/common/evas_font.h b/src/lib/evas/common/evas_font.h
index 5c7c1afcd..6517aa7f8 100644
--- a/legacy/evas/src/lib/engines/common/evas_font.h
+++ b/src/lib/evas/common/evas_font.h
@@ -9,7 +9,7 @@
EAPI void evas_common_font_init (void);
EAPI void evas_common_font_shutdown (void);
EAPI void evas_common_font_font_all_unload (void);
-
+
EAPI int evas_common_font_ascent_get (RGBA_Font *fn);
EAPI int evas_common_font_descent_get (RGBA_Font *fn);
EAPI int evas_common_font_max_ascent_get (RGBA_Font *fn);
@@ -63,8 +63,8 @@ EAPI void evas_common_font_all_clear (void);
EAPI int evas_common_font_query_kerning (RGBA_Font_Int* fi, FT_UInt left, FT_UInt right, int* kerning);
EAPI void evas_common_font_query_size (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *w, int *h);
-EAPI int evas_common_font_query_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props);
-EAPI int evas_common_font_query_right_inset (RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props);
+EAPI int evas_common_font_query_inset (RGBA_Font *fn, const Evas_Text_Props *text_props);
+EAPI int evas_common_font_query_right_inset (RGBA_Font *fn, const Evas_Text_Props *text_props);
EAPI void evas_common_font_query_advance (RGBA_Font *fn, const Evas_Text_Props *intl_props, int *h_adv, int *v_adv);
EAPI int evas_common_font_query_char_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cx, int *cy, int *cw, int *ch);
EAPI int evas_common_font_query_pen_coords (RGBA_Font *fn, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch);
diff --git a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x b/src/lib/evas/common/evas_font_default_walk.x
index 763620116..763620116 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_default_walk.x
+++ b/src/lib/evas/common/evas_font_default_walk.x
diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index 6f0b6e7aa..0c760e617 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -30,7 +30,7 @@ evas_common_font_draw_init(void)
static void
evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, int x, int y,
const Evas_Text_Props *text_props, RGBA_Gfx_Func func, int ext_x, int ext_y, int ext_w,
- int ext_h, int im_w, int im_h __UNUSED__)
+ int ext_h, int im_w, int im_h EINA_UNUSED)
{
DATA32 *im;
Evas_Glyph *glyphs;
diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index 3e0cf1cc1..f3be326fe 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -1,18 +1,22 @@
-#include "evas_common.h"
-#include "evas_private.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <assert.h>
+#ifdef USE_HARFBUZZ
+# include <hb.h>
+# include <hb-ft.h>
+#endif
+
+#include "evas_common.h"
+#include "evas_private.h"
+
#include "evas_font_private.h" /* for Frame-Queuing support */
#include "evas_font_ot.h"
#ifdef EVAS_CSERVE2
-# include "../../cserve2/evas_cs2_private.h"
-#endif
-
-#ifdef USE_HARFBUZZ
-# include <hb.h>
-# include <hb-ft.h>
+# include "../cserve2/evas_cs2_private.h"
#endif
extern FT_Library evas_ft_lib;
@@ -30,8 +34,8 @@ static int fonts_use_usage = 0;
static void _evas_common_font_int_clear(RGBA_Font_Int *fi);
static int
-_evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length __UNUSED__,
- const RGBA_Font_Int *k2, int k2_length __UNUSED__)
+_evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length EINA_UNUSED,
+ const RGBA_Font_Int *k2, int k2_length EINA_UNUSED)
{
/* RGBA_Font_Source->name is a stringshare */
if (k1->src->name == k2->src->name)
@@ -45,7 +49,7 @@ _evas_font_cache_int_cmp(const RGBA_Font_Int *k1, int k1_length __UNUSED__,
}
static int
-_evas_font_cache_int_hash(const RGBA_Font_Int *key, int key_length __UNUSED__)
+_evas_font_cache_int_hash(const RGBA_Font_Int *key, int key_length EINA_UNUSED)
{
int hash;
unsigned int wanted_rend = key->wanted_rend;
@@ -283,8 +287,8 @@ evas_common_font_size_use(RGBA_Font *fn)
}
static int
-_evas_common_font_double_int_cmp(const int *key1, __UNUSED__ int key1_length,
- const int *key2, __UNUSED__ int key2_length)
+_evas_common_font_double_int_cmp(const int *key1, EINA_UNUSED int key1_length,
+ const int *key2, EINA_UNUSED int key2_length)
{
if (key1[0] - key2[0] == 0) return key1[1] - key2[1];
return key1[0] - key2[0];
@@ -758,7 +762,7 @@ _evas_common_font_int_clear(RGBA_Font_Int *fi)
}
static Eina_Bool
-_evas_common_font_all_clear_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
+_evas_common_font_all_clear_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
{
RGBA_Font_Int *fi = data;
_evas_common_font_int_clear(fi);
diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index d577d43ad..401bb1b52 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -1,14 +1,18 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
#include "evas_common.h"
#include "evas_private.h"
#include "evas_font_private.h"
#ifdef EVAS_CSERVE2
-# include "../../cserve2/evas_cs2_private.h"
+# include "../cserve2/evas_cs2_private.h"
#endif
-#include <assert.h>
-
#include FT_OUTLINE_H
#include FT_SYNTHESIS_H
diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c
index 9ed92c75f..9ed92c75f 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_ot.c
+++ b/src/lib/evas/common/evas_font_ot.c
diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.h b/src/lib/evas/common/evas_font_ot.h
index 6398c92be..6398c92be 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_ot.h
+++ b/src/lib/evas/common/evas_font_ot.h
diff --git a/legacy/evas/src/lib/engines/common/evas_font_private.h b/src/lib/evas/common/evas_font_private.h
index 904a01e4b..904a01e4b 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_private.h
+++ b/src/lib/evas/common/evas_font_private.h
diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index ddd6a5c91..32182bd96 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_query.c
+++ b/src/lib/evas/common/evas_font_query.c
@@ -234,7 +234,7 @@ evas_common_font_query_kerning(RGBA_Font_Int *fi, FT_UInt left, FT_UInt right,
* @return the calculated inset.
*/
EAPI int
-evas_common_font_query_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props)
+evas_common_font_query_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *text_props)
{
if (!text_props->len) return 0;
return text_props->info->glyph[text_props->start].x_bear;
@@ -253,7 +253,7 @@ evas_common_font_query_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Props *te
* @see evas_common_font_query_inset()
*/
EAPI int
-evas_common_font_query_right_inset(RGBA_Font *fn __UNUSED__, const Evas_Text_Props *text_props)
+evas_common_font_query_right_inset(RGBA_Font *fn EINA_UNUSED, const Evas_Text_Props *text_props)
{
const Evas_Font_Glyph_Info *gli;
if (!text_props->len) return 0;
diff --git a/legacy/evas/src/lib/engines/common/evas_image.h b/src/lib/evas/common/evas_image.h
index 766c90c68..766c90c68 100644
--- a/legacy/evas/src/lib/engines/common/evas_image.h
+++ b/src/lib/evas/common/evas_image.h
diff --git a/legacy/evas/src/lib/engines/common/evas_image_data.c b/src/lib/evas/common/evas_image_data.c
index ca09d1e8c..25cf3d70c 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_data.c
+++ b/src/lib/evas/common/evas_image_data.c
@@ -77,7 +77,7 @@ evas_common_rgba_image_from_copied_data(Image_Entry* ie_dst, int w, int h, DATA3
}
int
-evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, unsigned int w, unsigned int h __UNUSED__)
+evas_common_rgba_image_size_set(Image_Entry *ie_dst, const Image_Entry *ie_im, unsigned int w, unsigned int h EINA_UNUSED)
{
RGBA_Image *dst = (RGBA_Image *) ie_dst;
RGBA_Image *im = (RGBA_Image *) ie_im;
diff --git a/legacy/evas/src/lib/engines/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index 0c39495f8..3bea0f566 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -139,7 +139,7 @@ struct evas_image_foreach_loader_data
static Eina_Bool
-_evas_image_foreach_loader(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
+_evas_image_foreach_loader(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata)
{
Evas_Image_Load_Func *evas_image_load_func = NULL;
Evas_Module *em = data;
diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c
index 62e6a361b..a8f7317e3 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -467,7 +467,7 @@ _evas_common_rgba_image_unload(Image_Entry *im)
}
static void
-_evas_common_rgba_image_dirty_region(Image_Entry* ie, unsigned int x __UNUSED__, unsigned int y __UNUSED__, unsigned int w __UNUSED__, unsigned int h __UNUSED__)
+_evas_common_rgba_image_dirty_region(Image_Entry* ie, unsigned int x EINA_UNUSED, unsigned int y EINA_UNUSED, unsigned int w EINA_UNUSED, unsigned int h EINA_UNUSED)
{
RGBA_Image *im = (RGBA_Image *) ie;
diff --git a/legacy/evas/src/lib/engines/common/evas_image_private.h b/src/lib/evas/common/evas_image_private.h
index f40866cfd..f40866cfd 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_private.h
+++ b/src/lib/evas/common/evas_image_private.h
diff --git a/legacy/evas/src/lib/engines/common/evas_image_save.c b/src/lib/evas/common/evas_image_save.c
index d97cc5bb2..d97cc5bb2 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_save.c
+++ b/src/lib/evas/common/evas_image_save.c
diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 5a2d7a25a..606509a72 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -199,7 +199,7 @@ _sci_fix_newest(RGBA_Image *im)
static Scaleitem *
_sci_find(RGBA_Image *im,
- RGBA_Draw_Context *dc __UNUSED__, int smooth,
+ RGBA_Draw_Context *dc EINA_UNUSED, int smooth,
int src_region_x, int src_region_y,
unsigned int src_region_w, unsigned int src_region_h,
unsigned int dst_region_w, unsigned int dst_region_h)
@@ -364,11 +364,11 @@ evas_common_rgba_image_scalecache_flush(void)
}
EAPI void
-evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNUSED__,
+evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst EINA_UNUSED,
RGBA_Draw_Context *dc, int smooth,
int src_region_x, int src_region_y,
int src_region_w, int src_region_h,
- int dst_region_x __UNUSED__, int dst_region_y __UNUSED__,
+ int dst_region_x EINA_UNUSED, int dst_region_y EINA_UNUSED,
int dst_region_w, int dst_region_h)
{
#ifdef SCALECACHE
diff --git a/legacy/evas/src/lib/engines/common/evas_line.h b/src/lib/evas/common/evas_line.h
index 9d45e3d29..9d45e3d29 100644
--- a/legacy/evas/src/lib/engines/common/evas_line.h
+++ b/src/lib/evas/common/evas_line.h
diff --git a/legacy/evas/src/lib/engines/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c
index 76417f5ac..76417f5ac 100644
--- a/legacy/evas/src/lib/engines/common/evas_line_main.c
+++ b/src/lib/evas/common/evas_line_main.c
diff --git a/legacy/evas/src/lib/engines/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c
index bc2d5a139..1f68f8a1d 100644
--- a/legacy/evas/src/lib/engines/common/evas_map_image.c
+++ b/src/lib/evas/common/evas_map_image.c
@@ -82,7 +82,7 @@ _limit(Span *s, int c1, int c2, int nocol)
// 12.63 % of time - this can improve
static void
-_calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy __UNUSED__, int cw, int ch __UNUSED__)
+_calc_spans(RGBA_Map_Point *p, Line *spans, int ystart, int yend, int cx, int cy EINA_UNUSED, int cw, int ch EINA_UNUSED)
{
int i, y, yp, yy;
int py[4];
@@ -648,7 +648,7 @@ evas_common_map_rgba_prepare(RGBA_Image *src, RGBA_Image *dst,
EAPI void
evas_common_map_rgba(RGBA_Image *src, RGBA_Image *dst,
RGBA_Draw_Context *dc,
- int npoints __UNUSED__, RGBA_Map_Point *p,
+ int npoints EINA_UNUSED, RGBA_Map_Point *p,
int smooth, int level)
{
#ifdef BUILD_MMX
diff --git a/legacy/evas/src/lib/engines/common/evas_map_image.h b/src/lib/evas/common/evas_map_image.h
index f9c7b971b..f9c7b971b 100644
--- a/legacy/evas/src/lib/engines/common/evas_map_image.h
+++ b/src/lib/evas/common/evas_map_image.h
diff --git a/legacy/evas/src/lib/engines/common/evas_map_image_core.c b/src/lib/evas/common/evas_map_image_core.c
index b9bbeb57e..b9bbeb57e 100644
--- a/legacy/evas/src/lib/engines/common/evas_map_image_core.c
+++ b/src/lib/evas/common/evas_map_image_core.c
diff --git a/legacy/evas/src/lib/engines/common/evas_map_image_internal.c b/src/lib/evas/common/evas_map_image_internal.c
index 8f4660f1f..dba252b59 100644
--- a/legacy/evas/src/lib/engines/common/evas_map_image_internal.c
+++ b/src/lib/evas/common/evas_map_image_internal.c
@@ -3,7 +3,7 @@ static void
FUNC_NAME(RGBA_Image *src, RGBA_Image *dst,
RGBA_Draw_Context *dc,
RGBA_Map_Point *p,
- int smooth, int level __UNUSED__) // level unused for now - for future use
+ int smooth, int level EINA_UNUSED) // level unused for now - for future use
{
int i;
int c, cx, cy, cw, ch;
@@ -118,7 +118,7 @@ static void
FUNC_NAME_DO(RGBA_Image *src, RGBA_Image *dst,
RGBA_Draw_Context *dc,
const RGBA_Map_Spans *ms,
- int smooth, int level __UNUSED__) // level unused for now - for future use
+ int smooth, int level EINA_UNUSED) // level unused for now - for future use
{
Line *spans;
DATA32 *buf = NULL, *sp;
diff --git a/legacy/evas/src/lib/engines/common/evas_map_image_loop.c b/src/lib/evas/common/evas_map_image_loop.c
index c4343866d..c4343866d 100644
--- a/legacy/evas/src/lib/engines/common/evas_map_image_loop.c
+++ b/src/lib/evas/common/evas_map_image_loop.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_.c b/src/lib/evas/common/evas_op_add/op_add_color_.c
index 506c86f94..506c86f94 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_.c
+++ b/src/lib/evas/common/evas_op_add/op_add_color_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_i386.c b/src/lib/evas/common/evas_op_add/op_add_color_i386.c
index f4f83a4b3..f4f83a4b3 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_color_i386.c
+++ b/src/lib/evas/common/evas_op_add/op_add_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_.c b/src/lib/evas/common/evas_op_add/op_add_mask_color_.c
index 8255f1965..8255f1965 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_.c
+++ b/src/lib/evas/common/evas_op_add/op_add_mask_color_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_i386.c b/src/lib/evas/common/evas_op_add/op_add_mask_color_i386.c
index 6a86f86ab..6a86f86ab 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_add/op_add_mask_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_.c b/src/lib/evas/common/evas_op_add/op_add_pixel_.c
index 0f34dd3d8..0f34dd3d8 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_.c
+++ b/src/lib/evas/common/evas_op_add/op_add_pixel_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_.c b/src/lib/evas/common/evas_op_add/op_add_pixel_color_.c
index 246ce75cc..246ce75cc 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_.c
+++ b/src/lib/evas/common/evas_op_add/op_add_pixel_color_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_i386.c b/src/lib/evas/common/evas_op_add/op_add_pixel_color_i386.c
index fa382d9ad..fa382d9ad 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_color_i386.c
+++ b/src/lib/evas/common/evas_op_add/op_add_pixel_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_i386.c b/src/lib/evas/common/evas_op_add/op_add_pixel_i386.c
index eb2b5a3c7..eb2b5a3c7 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_i386.c
+++ b/src/lib/evas/common/evas_op_add/op_add_pixel_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_.c b/src/lib/evas/common/evas_op_add/op_add_pixel_mask_.c
index fc3ca00a1..fc3ca00a1 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_.c
+++ b/src/lib/evas/common/evas_op_add/op_add_pixel_mask_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_i386.c b/src/lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c
index a6309c3ef..a6309c3ef 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add/op_add_pixel_mask_i386.c
+++ b/src/lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_add_main_.c b/src/lib/evas/common/evas_op_add_main_.c
index 9decc4214..bde553c45 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_add_main_.c
+++ b/src/lib/evas/common/evas_op_add_main_.c
@@ -138,7 +138,7 @@ add_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -150,7 +150,7 @@ op_add_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -166,7 +166,7 @@ op_add_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -184,7 +184,7 @@ op_add_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi
}
static RGBA_Gfx_Func
-op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
@@ -200,7 +200,7 @@ op_add_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_add_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
@@ -362,7 +362,7 @@ add_rel_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -374,7 +374,7 @@ op_add_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED_
}
static RGBA_Gfx_Func
-op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -390,7 +390,7 @@ op_add_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -408,7 +408,7 @@ op_add_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, in
}
static RGBA_Gfx_Func
-op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
@@ -424,7 +424,7 @@ op_add_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED_
}
static RGBA_Gfx_Func
-op_add_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_add_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c b/src/lib/evas/common/evas_op_blend/op_blend_color_.c
index 277dced66..d92f0cb1d 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_color_.c
@@ -1,7 +1,7 @@
/* blend color -> dst */
static void
-_op_blend_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e, a = 256 - (c >> 24);
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -26,7 +26,7 @@ init_blend_color_span_funcs_c(void)
}
static void
-_op_blend_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = 256 - (c >> 24);
*d = c + MUL_256(s, *d);
}
@@ -54,7 +54,7 @@ init_blend_color_pt_funcs_c(void)
/* blend_rel color -> dst */
static void
-_op_blend_rel_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha = 256 - (c >> 24);
UNROLL8_PLD_WHILE(d, l, e,
@@ -80,7 +80,7 @@ init_blend_rel_color_span_funcs_c(void)
}
static void
-_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_rel_pt_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = *d >> 24;
*d = MUL_SYM(s, c) + MUL_256(256 - (c >> 24), *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_color_i386.c
index a05af7db4..ae9888ffa 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_i386.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_blend_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
@@ -35,7 +35,7 @@ init_blend_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
c = 256 - (c >> 24);
@@ -67,7 +67,7 @@ init_blend_color_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_rel_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
@@ -103,7 +103,7 @@ init_blend_rel_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_rel_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_rel_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
MOV_A2R(ALPHA_255, mm5)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_color_neon.c
index 53b99913c..8512bb444 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_color_neon.c
@@ -2,7 +2,7 @@
#ifdef BUILD_NEON
static void
-_op_blend_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e, *tmp = 0;
#define AP "B_C_DP"
asm volatile (
@@ -147,7 +147,7 @@ init_blend_color_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_blend_pt_c_dp_neon(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_c_dp_neon(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = 256 - (c >> 24);
*d = c + MUL_256(s, *d);
}
@@ -173,7 +173,7 @@ init_blend_color_pt_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_blend_rel_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha = 256 - (c >> 24);
UNROLL8_PLD_WHILE(d, l, e,
@@ -201,7 +201,7 @@ init_blend_rel_color_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_blend_rel_pt_c_dp_neon(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_rel_pt_c_dp_neon(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = *d >> 24;
*d = MUL_SYM(s, c) + MUL_256(256 - (c >> 24), *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c
index 1843265fc..02321b5bd 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_color_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c
@@ -3,7 +3,7 @@
#ifdef BUILD_SSE3
static void
-_op_blend_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 a = 256 - (c >> 24);
@@ -87,7 +87,7 @@ init_blend_color_pt_funcs_sse3(void)
/* blend_rel color -> dst */
static void
-_op_blend_rel_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
int alpha = 256 - (c >> 24);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_.c
index 715f8d9da..f0b6ef758 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_.c
@@ -1,7 +1,7 @@
/* blend mask x color -> dst */
static void
-_op_blend_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha = 256 - (c >> 24);
UNROLL8_PLD_WHILE(d, l, e,
@@ -27,7 +27,7 @@ _op_blend_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_mas_can_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_can_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -79,7 +79,7 @@ _op_blend_pt_mas_c_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
}
static void
-_op_blend_pt_mas_can_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
+_op_blend_pt_mas_can_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) {
*d = INTERP_256(m + 1, c, *d);
}
@@ -110,7 +110,7 @@ init_blend_mask_color_pt_funcs_c(void)
/* blend_rel mask x color --> dst */
static void
-_op_blend_rel_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c
index f8fe02e87..0031a9119 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_blend_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
@@ -42,7 +42,7 @@ _op_blend_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int
}
static void
-_op_blend_mas_can_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_can_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
@@ -143,7 +143,7 @@ init_blend_mask_color_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_rel_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
index f5eb480cd..da7cd3e24 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c
@@ -18,7 +18,7 @@
#ifdef BUILD_NEON
static void
-_op_blend_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
DEBUG_FNCOUNT("");
@@ -198,7 +198,7 @@ _op_blend_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int
#ifdef BUILD_NEON
static void
-_op_blend_mas_can_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_can_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e,*tmp;
int alpha;
@@ -489,7 +489,7 @@ init_blend_mask_color_pt_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_blend_rel_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c
index 5883d15ec..429e8d5ce 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c
@@ -3,7 +3,7 @@
#ifdef BUILD_SSE3
static void
-_op_blend_mas_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
@@ -69,7 +69,7 @@ _op_blend_mas_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int
}
static void
-_op_blend_mas_can_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_mas_can_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 alpha;
@@ -211,7 +211,7 @@ init_blend_mask_color_pt_funcs_sse3(void)
/* blend_rel mask x color --> dst */
static void
-_op_blend_rel_mas_c_dp_sse3(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_mas_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c
index eac6755b9..eac6755b9 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_master_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_.c
index ba11296eb..b1d119613 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_.c
@@ -1,7 +1,7 @@
/* blend pixel --> dst */
static void
-_op_blend_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -13,7 +13,7 @@ _op_blend_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, i
}
static void
-_op_blend_pas_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -53,7 +53,7 @@ init_blend_pixel_span_funcs_c(void)
}
static void
-_op_blend_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
c = 256 - (s >> 24);
*d = s + MUL_256(c, *d);
}
@@ -82,7 +82,7 @@ init_blend_pixel_pt_funcs_c(void)
/* blend_rel pixel -> dst */
static void
-_op_blend_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -96,7 +96,7 @@ _op_blend_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_rel_pan_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_pan_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -125,13 +125,13 @@ init_blend_rel_pixel_span_funcs_c(void)
}
static void
-_op_blend_rel_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_rel_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
c = 256 - (s >> 24);
*d = MUL_SYM(*d >> 24, s) + MUL_256(c, *d);
}
static void
-_op_blend_rel_pt_pan_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_blend_rel_pt_pan_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = MUL_SYM(*d >> 24, s);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_.c
index db8837f43..8d6e944de 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_.c
@@ -1,7 +1,7 @@
/* blend pixel x color --> dst */
static void
-_op_blend_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -15,7 +15,7 @@ _op_blend_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_pan_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha = 256 - (c >> 24);
UNROLL8_PLD_WHILE(d, l, e,
@@ -27,7 +27,7 @@ _op_blend_pan_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_p_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_can_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -40,7 +40,7 @@ _op_blend_p_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_pan_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_can_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -50,7 +50,7 @@ _op_blend_pan_can_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l)
}
static void
-_op_blend_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
c = 1 + (c & 0xff);
@@ -65,7 +65,7 @@ _op_blend_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_pan_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
c = 1 + (c & 0xff);
UNROLL8_PLD_WHILE(d, l, e,
@@ -115,7 +115,7 @@ init_blend_pixel_color_span_funcs_c(void)
}
static void
-_op_blend_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
c = 256 - (s >> 24);
*d = s + MUL_256(c, *d);
@@ -169,7 +169,7 @@ init_blend_pixel_color_pt_funcs_c(void)
/* blend_rel pixel x color -> dst */
static void
-_op_blend_rel_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -226,7 +226,7 @@ init_blend_rel_pixel_color_span_funcs_c(void)
}
static void
-_op_blend_rel_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_rel_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
c = 256 - (s >> 24);
*d = MUL_SYM(*d >> 24, s) + MUL_256(c, *d);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c
index 52751f484..7cb97ae31 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_i386.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_blend_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
MOV_A2R(ALPHA_256, mm6)
MOV_A2R(ALPHA_255, mm5)
@@ -26,7 +26,7 @@ _op_blend_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l)
}
static void
-_op_blend_pan_can_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_can_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
@@ -40,7 +40,7 @@ _op_blend_pan_can_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, in
}
static void
-_op_blend_pan_caa_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_caa_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c & 0xff);
MOV_A2R(c, mm2)
@@ -100,7 +100,7 @@ init_blend_pixel_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
MOV_A2R(ALPHA_256, mm4)
MOV_A2R(ALPHA_255, mm5)
pxor_r2r(mm0, mm0);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c
index 6e359704a..765f55878 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c
@@ -3,7 +3,7 @@
/* Note: Optimisation is based on keeping _dest_ aligned: else it's a pair of
* reads, then two writes, a miss on read is 'just' two reads */
static void
-_op_blend_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_c_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
#define AP "blend_p_c_dp_"
asm volatile (
".fpu neon \n\t"
@@ -189,7 +189,7 @@ _op_blend_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l
}
static void
-_op_blend_pan_can_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_can_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -199,7 +199,7 @@ _op_blend_pan_can_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, i
}
static void
-_op_blend_pan_caa_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_caa_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
#if 1
DATA32 *e;
int alpha;
@@ -461,7 +461,7 @@ init_blend_pixel_color_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_blend_pt_p_c_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_blend_pt_p_c_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
c = 256 - (s >> 24);
*d = s + MUL_256(c, *d);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c
index 4ee31f54c..b0c2b84f8 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_color_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c
@@ -3,7 +3,7 @@
#ifdef BUILD_SSE3
static void
-_op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 alpha;
@@ -60,7 +60,7 @@ _op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l
}
static void
-_op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 c_a = c & 0xFF000000;
DATA32 alpha = 256 - (c >> 24);
@@ -114,7 +114,7 @@ _op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int
}
static void
-_op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
int alpha;
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
@@ -169,7 +169,7 @@ _op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int
}
static void
-_op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
@@ -209,7 +209,7 @@ _op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, i
}
static void
-_op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
int alpha;
c = 1 + (c & 0xff);
@@ -263,7 +263,7 @@ _op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int
}
static void
-_op_blend_pan_caa_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_pan_caa_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
c = 1 + (c & 0xff);
const __m128i c_packed = _mm_set_epi32(c, c, c,c);
@@ -391,7 +391,7 @@ init_blend_pixel_color_pt_funcs_sse3(void)
/* blend_rel pixel x color -> dst */
static void
-_op_blend_rel_p_c_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_p_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
int alpha;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c
index 9b5abe6f4..a4333a89f 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_i386.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_blend_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
@@ -23,7 +23,7 @@ _op_blend_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *
}
static void
-_op_blend_pas_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
_op_blend_p_dp_mmx(s, m, c, d, l);
return;
DATA32 *e = d + l;
@@ -76,7 +76,7 @@ init_blend_pixel_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_blend_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
MOV_P2R(s, mm2, mm0)
@@ -118,7 +118,7 @@ init_blend_pixel_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_rel_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_rel_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
@@ -142,7 +142,7 @@ _op_blend_rel_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA
}
static void
-_op_blend_rel_pan_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_rel_pan_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
@@ -178,7 +178,7 @@ init_blend_rel_pixel_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_blend_rel_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_blend_rel_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
MOV_A2R(ALPHA_255, mm5)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c
index f0b2a6c24..5d6c97686 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c
@@ -26,7 +26,7 @@ _op_blend_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -49,7 +49,7 @@ _op_blend_pas_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l)
}
static void
-_op_blend_pan_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pan_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -96,7 +96,7 @@ _op_blend_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c, DATA32 *d) {
}
static void
-_op_blend_pt_pan_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
+_op_blend_pt_pan_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = INTERP_256(m + 1, s, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_i386.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c
index 4fa50a964..8c960d211 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_i386.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_blend_pas_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_256, mm6)
@@ -37,7 +37,7 @@ _op_blend_pas_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, in
}
static void
-_op_blend_pan_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pan_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
MOV_A2R(ALPHA_255, mm5)
pxor_r2r(mm0, mm0);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c
index b252a6752..d36e71472 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c
@@ -2,7 +2,7 @@
#ifdef BUILD_NEON
static void
-_op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
@@ -25,7 +25,7 @@ _op_blend_pas_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, i
}
static void
-_op_blend_pan_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pan_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int alpha;
UNROLL8_PLD_WHILE(d, l, e,
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c
index 617b9e258..e33831f19 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_mask_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c
@@ -62,7 +62,7 @@ _op_blend_p_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_blend_pas_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
const __m128i ones = _mm_set_epi32(1, 1, 1, 1);
int alpha;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c
index 1cb50b621..1cb50b621 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_neon.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_neon.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
index 69c597c44..2601853ce 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
@@ -3,7 +3,7 @@
#ifdef BUILD_SSE3
static void
-_op_blend_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_p_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
LOOP_ALIGNED_U1_A48_SSE3(d, l,
{ /* UOP */
@@ -50,7 +50,7 @@ _op_blend_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32
}
static void
-_op_blend_pas_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_blend_pas_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
int alpha;
@@ -178,7 +178,7 @@ init_blend_pixel_pt_funcs_sse3(void)
/* blend_rel pixel -> dst */
static void
-_op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
const __m128i ones = _mm_set_epi32(1, 1, 1, 1);
@@ -229,7 +229,7 @@ _op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int
}
static void
-_op_blend_rel_pan_dp_sse3(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_blend_rel_pan_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
const __m128i ones = _mm_set_epi32(1, 1, 1, 1);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend_main_.c b/src/lib/evas/common/evas_op_blend_main_.c
index 164203699..b3aaf90a2 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_blend_main_.c
+++ b/src/lib/evas/common/evas_op_blend_main_.c
@@ -183,7 +183,7 @@ blend_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -199,7 +199,7 @@ op_blend_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -215,7 +215,7 @@ op_blend_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -237,7 +237,7 @@ op_blend_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int
}
static RGBA_Gfx_Func
-op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
@@ -253,7 +253,7 @@ op_blend_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_blend_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
@@ -468,7 +468,7 @@ blend_rel_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -484,7 +484,7 @@ op_blend_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSE
}
static RGBA_Gfx_Func
-op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -500,7 +500,7 @@ op_blend_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -518,7 +518,7 @@ op_blend_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst,
}
static RGBA_Gfx_Func
-op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
@@ -534,7 +534,7 @@ op_blend_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSE
}
static RGBA_Gfx_Func
-op_blend_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_blend_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_color_.c
index 99591b22a..3dc5582f6 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_color_.c
@@ -1,7 +1,7 @@
/* copy color --> dst */
static void
-_op_copy_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -34,7 +34,7 @@ init_copy_color_span_funcs_c(void)
}
static void
-_op_copy_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = c;
}
@@ -66,7 +66,7 @@ init_copy_color_pt_funcs_c(void)
/* copy_rel color --> dst */
static void
-_op_copy_rel_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -100,7 +100,7 @@ init_copy_rel_color_span_funcs_c(void)
}
static void
-_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = 1 + (*d >> 24);
*d = MUL_256(s, c);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_color_i386.c
index d864d924d..d526491c8 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_i386.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_copy_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l - 1;
movd_m2r(c, mm1);
movq_r2r(mm1, mm2);
@@ -43,7 +43,7 @@ init_copy_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = c;
}
@@ -77,7 +77,7 @@ init_copy_color_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
@@ -115,7 +115,7 @@ init_copy_rel_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_pt_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = 1 + (*d >> 24);
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_color_neon.c
index 96310cdf3..96310cdf3 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_color_neon.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_color_neon.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_.c
index 16faa2822..efe7cca35 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_.c
@@ -1,7 +1,7 @@
/* copy mask x color -> dst */
static void
-_op_copy_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_copy_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int color;
UNROLL8_PLD_WHILE(d, l, e,
@@ -47,7 +47,7 @@ init_copy_mask_color_span_funcs_c(void)
}
static void
-_op_copy_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
+_op_copy_pt_mas_c_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) {
*d = INTERP_256(m + 1, c, *d);
}
@@ -80,7 +80,7 @@ init_copy_mask_color_pt_funcs_c(void)
/* copy_rel mask x color -> dst */
static void
-_op_copy_rel_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
int color;
UNROLL8_PLD_WHILE(d, l, e,
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c
index e27493f82..a8c85e0f7 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_copy_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_copy_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
@@ -98,7 +98,7 @@ init_copy_mask_color_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c
index dc7f78f26..7d9a44e4b 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_mask_color_neon.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c
@@ -2,7 +2,7 @@
#ifdef BUILD_NEON
static void
-_op_copy_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_copy_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
int color;
@@ -85,7 +85,7 @@ init_copy_mask_color_pt_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_rel_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_mas_c_dp_neon(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
int color;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_.c
index 2936d43a1..e3cc111d8 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_.c
@@ -1,7 +1,7 @@
/* copy pixel --> dst */
static void
-_op_copy_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
memcpy(d, s, l * sizeof(DATA32));
}
@@ -25,7 +25,7 @@ init_copy_pixel_span_funcs_c(void)
}
static void
-_op_copy_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_copy_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = s;
}
@@ -53,7 +53,7 @@ init_copy_pixel_pt_funcs_c(void)
/* copy_rel pixel --> dst */
static void
-_op_copy_rel_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_rel_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -83,7 +83,7 @@ init_copy_rel_pixel_span_funcs_c(void)
}
static void
-_op_copy_rel_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
c = 1 + (*d >> 24);
*d = MUL_256(c, s);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_.c
index 79ca17b79..0b1f8e7ca 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_.c
@@ -1,7 +1,7 @@
/* copy pixel x color --> dst */
static void
-_op_copy_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -12,7 +12,7 @@ _op_copy_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_copy_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_p_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
c = 1 + (c >> 24);
UNROLL8_PLD_WHILE(d, l, e,
@@ -67,12 +67,12 @@ init_copy_pixel_color_span_funcs_c(void)
}
static void
-_op_copy_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = MUL4_SYM(c, s);
}
static void
-_op_copy_pt_p_caa_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_pt_p_caa_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = MUL_SYM(c >> 24, s);
}
@@ -124,7 +124,7 @@ init_copy_pixel_color_pt_funcs_c(void)
/* copy_rel pixel x color --> dst */
static void
-_op_copy_rel_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
{
@@ -179,7 +179,7 @@ init_copy_rel_pixel_color_span_funcs_c(void)
}
static void
-_op_copy_rel_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
*d = MUL_SYM(*d >> 24, s);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c
index fb5bc7078..e50e818e1 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_i386.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_copy_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm3, mm0)
@@ -17,7 +17,7 @@ _op_copy_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l)
static void
-_op_copy_p_caa_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_p_caa_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
MOV_A2R(c, mm3)
@@ -76,7 +76,7 @@ init_copy_pixel_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
MOV_P2R(c, mm2, mm0)
@@ -135,7 +135,7 @@ init_copy_pixel_color_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm3, mm0)
@@ -197,7 +197,7 @@ init_copy_rel_pixel_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm3, mm0)
MOV_A2R(ALPHA_255, mm5)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c
index f8a1e79cf..cccfe441e 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_color_neon.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c
@@ -2,7 +2,7 @@
#ifdef BUILD_NEON
static void
-_op_copy_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_p_c_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
@@ -15,7 +15,7 @@ _op_copy_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l)
static void
-_op_copy_p_caa_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it
+_op_copy_p_caa_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) { // FIXME: neon-it
// FIXME: neon-it
DATA32 *e;
c = 1 + (c >> 24);
@@ -73,7 +73,7 @@ init_copy_pixel_color_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_pt_p_c_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_pt_p_c_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = MUL4_SYM(c, s);
}
@@ -127,7 +127,7 @@ init_copy_pixel_color_pt_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_rel_p_c_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_copy_rel_p_c_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
@@ -186,7 +186,7 @@ init_copy_rel_pixel_color_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_rel_pt_p_c_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_p_c_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
*d = MUL_SYM(*d >> 24, s);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_i386.c
index b03022b96..1659a0928 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_i386.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_copy_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l - 15;
for (; d < e; d+=16, s+=16) {
MOVE_16DWORDS_MMX(s, d);
@@ -35,7 +35,7 @@ init_copy_pixel_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_copy_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = s;
}
@@ -65,7 +65,7 @@ init_copy_pixel_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_rel_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
@@ -100,7 +100,7 @@ init_copy_rel_pixel_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
c = 1 + (*d >> 24);
MOV_A2R(c, mm1)
pxor_r2r(mm0, mm0);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c
index 4cec8af40..5a861b259 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c
@@ -1,7 +1,7 @@
/* copy pixel x mask --> dst */
static void
-_op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e;
int color;
UNROLL8_PLD_WHILE(d, l, e,
@@ -44,7 +44,7 @@ init_copy_pixel_mask_span_funcs_c(void)
}
static void
-_op_copy_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
+_op_copy_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = INTERP_256(m + 1, s, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_i386.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c
index 2511c41fa..d70162b97 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_i386.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_copy_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
@@ -87,7 +87,7 @@ init_copy_pixel_mask_pt_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_copy_rel_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_rel_p_mas_dp_mmx(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c
index e25f8f8db..993e5af8c 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_mask_neon.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c
@@ -2,7 +2,7 @@
#ifdef BUILD_NEON
static void
-_op_copy_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
int color;
@@ -77,7 +77,7 @@ init_copy_pixel_mask_pt_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_rel_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_rel_p_mas_dp_neon(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
int color;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_neon.c b/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c
index 5b8bd6038..244b58594 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy/op_copy_pixel_neon.c
+++ b/src/lib/evas/common/evas_op_copy/op_copy_pixel_neon.c
@@ -2,7 +2,7 @@
#ifdef BUILD_NEON
static void
-_op_copy_p_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
//#define USENEON 1
#ifndef USENEON
memcpy(d, s, l * sizeof(DATA32));
@@ -68,7 +68,7 @@ init_copy_pixel_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_pt_p_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_copy_pt_p_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = s;
}
@@ -98,7 +98,7 @@ init_copy_pixel_pt_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_rel_p_dp_neon(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_copy_rel_p_dp_neon(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
// FIXME: neon-it
DATA32 *e;
UNROLL8_PLD_WHILE(d, l, e,
@@ -131,7 +131,7 @@ init_copy_rel_pixel_span_funcs_neon(void)
#ifdef BUILD_NEON
static void
-_op_copy_rel_pt_p_dp_neon(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_copy_rel_pt_p_dp_neon(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = 1 + (*d >> 24);
*d = MUL_256(s, c);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_copy_main_.c b/src/lib/evas/common/evas_op_copy_main_.c
index 43b7e342b..9debe171b 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_copy_main_.c
+++ b/src/lib/evas/common/evas_op_copy_main_.c
@@ -172,7 +172,7 @@ copy_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -187,7 +187,7 @@ op_copy_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -207,7 +207,7 @@ op_copy_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -233,7 +233,7 @@ op_copy_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int p
}
static RGBA_Gfx_Func
-op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
@@ -249,7 +249,7 @@ op_copy_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_copy_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
@@ -454,7 +454,7 @@ copy_rel_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -470,7 +470,7 @@ op_copy_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED
}
static RGBA_Gfx_Func
-op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -490,7 +490,7 @@ op_copy_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -516,7 +516,7 @@ op_copy_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, i
}
static RGBA_Gfx_Func
-op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
@@ -532,7 +532,7 @@ op_copy_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED
}
static RGBA_Gfx_Func
-op_copy_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_copy_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c b/src/lib/evas/common/evas_op_mask/op_mask_color_.c
index c95731568..d3401dd9d 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_color_.c
@@ -1,7 +1,7 @@
/* mask color --> dst */
static void
-_op_mask_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mask_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
for (; d < e; d++) {
@@ -25,7 +25,7 @@ init_mask_color_span_funcs_c(void)
}
static void
-_op_mask_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mask_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = MUL_SYM(c >> 24, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_color_i386.c
index 9635eac99..4c182fb67 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_mask_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mask_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
MOV_A2R(c, mm2)
@@ -32,7 +32,7 @@ init_mask_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_mask_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mask_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
c = 1 + (c >> 24);
MOV_A2R(c, mm2)
pxor_r2r(mm0, mm0);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_.c b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_.c
index dacd23ab8..939c1baf4 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_.c
@@ -1,7 +1,7 @@
/* mask mask x color -> dst */
static void
-_op_mask_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_mask_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
while (d < e) {
@@ -38,7 +38,7 @@ init_mask_mask_color_span_funcs_c(void)
}
static void
-_op_mask_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
+_op_mask_pt_mas_c_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) {
c = 256 - (((256 - (c >> 24)) * m) >> 8);
*d = MUL_256(c, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c
index 9427dbfe6..9427dbfe6 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_.c
index 822e74b20..dfccb57e9 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_.c
@@ -1,7 +1,7 @@
/* mask pixel --> dst */
static void
-_op_mask_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_mask_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
for (; d < e; d++, s++) {
*d = MUL_SYM(*s >> 24, *d);
@@ -24,7 +24,7 @@ init_mask_pixel_span_funcs_c(void)
}
static void
-_op_mask_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_mask_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = MUL_SYM(s >> 24, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_.c
index d236671b7..aa726b41a 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_.c
@@ -1,7 +1,7 @@
/* mask pixel x color --> dst */
static void
-_op_mask_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mask_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
l = 1 + (c >> 24);
while (d < e) {
@@ -51,7 +51,7 @@ init_mask_pixel_color_span_funcs_c(void)
}
static void
-_op_mask_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mask_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
c = 1 + ((((c >> 24) * (s >> 24)) + 255) >> 8);
*d = MUL_256(c, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c
index 0afcb71ae..0afcb71ae 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_color_i386.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_i386.c
index a1c09af62..366abb03f 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_i386.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_mask_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_mask_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
MOV_A2R(ALPHA_255, mm5)
pxor_r2r(mm0, mm0);
@@ -32,7 +32,7 @@ init_mask_pixel_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_mask_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_mask_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
MOV_A2R(ALPHA_255, mm5)
pxor_r2r(mm0, mm0);
MOV_P2R(*d, mm1, mm0)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c
index 5a5c4f0a2..c6f08a98e 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c
@@ -1,7 +1,7 @@
/* mask pixel x mask --> dst */
static void
-_op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_mask_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
while (d < e) {
l = *m;
@@ -37,7 +37,7 @@ init_mask_pixel_mask_span_funcs_c(void)
}
static void
-_op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
+_op_mask_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) {
s = 256 - (((256 - (s >> 24)) * m) >> 8);
*d = MUL_256(s, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_i386.c b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c
index c5dd8daf4..c5dd8daf4 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask/op_mask_pixel_mask_i386.c
+++ b/src/lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mask_main_.c b/src/lib/evas/common/evas_op_mask_main_.c
index 221a59df9..4ed41d6db 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mask_main_.c
+++ b/src/lib/evas/common/evas_op_mask_main_.c
@@ -106,7 +106,7 @@ mask_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -121,7 +121,7 @@ op_mask_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -141,7 +141,7 @@ op_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -167,7 +167,7 @@ op_mask_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int p
}
static RGBA_Gfx_Func
-op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
@@ -183,7 +183,7 @@ op_mask_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_mask_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_mask_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c b/src/lib/evas/common/evas_op_mul/op_mul_color_.c
index 7e16c6ce8..8649f2485 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_color_.c
@@ -1,7 +1,7 @@
/* mul color --> dst */
static void
-_op_mul_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mul_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
for (; d < e; d++) {
*d = MUL4_SYM(c, *d);
@@ -9,7 +9,7 @@ _op_mul_c_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int
}
static void
-_op_mul_caa_dp(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mul_caa_dp(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
for (; d < e; d++) {
@@ -36,7 +36,7 @@ init_mul_color_span_funcs_c(void)
}
static void
-_op_mul_pt_c_dp(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mul_pt_c_dp(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
*d = MUL4_SYM(c, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_color_i386.c
index 95f43f6bd..fa4f28280 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_color_i386.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_mul_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mul_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
@@ -36,7 +36,7 @@ init_mul_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_mul_pt_c_dp_mmx(DATA32 s __UNUSED__, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mul_pt_c_dp_mmx(DATA32 s EINA_UNUSED, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
MOV_P2R(c, mm2, mm0)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_.c b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_.c
index 2840e6f78..9c9a64188 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_.c
@@ -1,7 +1,7 @@
/* mul mask x color -> dst */
static void
-_op_mul_mas_c_dp(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_mul_mas_c_dp(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l, nc = ~c;
while (d < e)
{
@@ -42,7 +42,7 @@ init_mul_mask_color_span_funcs_c(void)
}
static void
-_op_mul_pt_mas_c_dp(DATA32 s __UNUSED__, DATA8 m, DATA32 c, DATA32 *d) {
+_op_mul_pt_mas_c_dp(DATA32 s EINA_UNUSED, DATA8 m, DATA32 c, DATA32 *d) {
c = ~c;
c = ~MUL_SYM(m, c);
*d = MUL4_SYM(c, *d);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c
index 1999503af..2f53a6aee 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_mul_mas_c_dp_mmx(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int l) {
+_op_mul_mas_c_dp_mmx(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
MOV_P2R(c, mm2, mm0)
c = ~c;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_.c
index 78ca8345d..8531a9199 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_.c
@@ -1,7 +1,7 @@
/* mul pixel --> dst */
static void
-_op_mul_p_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_mul_p_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = d + l;
for (; d < e; d++, s++) {
*d = MUL4_SYM(*s, *d);
@@ -28,7 +28,7 @@ init_mul_pixel_span_funcs_c(void)
}
static void
-_op_mul_pt_p_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_mul_pt_p_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
*d = MUL4_SYM(s, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_.c
index 40fbc709f..50a6aa457 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_.c
@@ -1,7 +1,7 @@
/* mul pixel x color --> dst */
static void
-_op_mul_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mul_p_c_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
while (d < e) {
DATA32 cs = MUL4_SYM(c, *s);
@@ -11,7 +11,7 @@ _op_mul_p_c_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
}
static void
-_op_mul_p_caa_dp(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mul_p_caa_dp(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
c = 1 + (c >> 24);
while (d < e)
@@ -65,13 +65,13 @@ init_mul_pixel_color_span_funcs_c(void)
}
static void
-_op_mul_pt_p_c_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mul_pt_p_c_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL4_SYM(c, s);
*d = MUL4_SYM(s, *d);
}
static void
-_op_mul_pt_p_caa_dp(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mul_pt_p_caa_dp(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
s = MUL_SYM(c >> 24, s);
*d = MUL4_SYM(s, *d);
}
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c
index 24f5a80f4..fd21a24c7 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_color_i386.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_mul_p_c_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c, DATA32 *d, int l) {
+_op_mul_p_c_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c, DATA32 *d, int l) {
DATA32 *e = d + l;
MOV_A2R(ALPHA_255, mm5)
pxor_r2r(mm0, mm0);
@@ -64,7 +64,7 @@ init_mul_pixel_color_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_mul_pt_p_c_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c, DATA32 *d) {
+_op_mul_pt_p_c_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c, DATA32 *d) {
MOV_A2R(ALPHA_255, mm5)
pxor_r2r(mm0, mm0);
MOV_P2R(c, mm2, mm0)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_i386.c
index 0db6cd75f..cacb52409 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_i386.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_i386.c
@@ -2,7 +2,7 @@
#ifdef BUILD_MMX
static void
-_op_mul_p_dp_mmx(DATA32 *s, DATA8 *m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d, int l) {
+_op_mul_p_dp_mmx(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d, int l) {
DATA32 *e = s + l;
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
@@ -36,7 +36,7 @@ init_mul_pixel_span_funcs_mmx(void)
#ifdef BUILD_MMX
static void
-_op_mul_pt_p_dp_mmx(DATA32 s, DATA8 m __UNUSED__, DATA32 c __UNUSED__, DATA32 *d) {
+_op_mul_pt_p_dp_mmx(DATA32 s, DATA8 m EINA_UNUSED, DATA32 c EINA_UNUSED, DATA32 *d) {
pxor_r2r(mm0, mm0);
MOV_A2R(ALPHA_255, mm5)
MOV_P2R(*d, mm1, mm0)
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c
index bd500e732..29ec6da27 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c
@@ -87,7 +87,7 @@ init_mul_pixel_mask_span_funcs_c(void)
}
static void
-_op_mul_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c __UNUSED__, DATA32 *d) {
+_op_mul_pt_p_mas_dp(DATA32 s, DATA8 m, DATA32 c EINA_UNUSED, DATA32 *d) {
s = ~s;
s = ~MUL_SYM(m, s);
*d = MUL4_SYM(s, *d);
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_i386.c b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c
index ebbac01d7..ebbac01d7 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul/op_mul_pixel_mask_i386.c
+++ b/src/lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_mul_main_.c b/src/lib/evas/common/evas_op_mul_main_.c
index d80900976..26604d723 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_mul_main_.c
+++ b/src/lib/evas/common/evas_op_mul_main_.c
@@ -105,7 +105,7 @@ mul_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -120,7 +120,7 @@ op_mul_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -140,7 +140,7 @@ op_mul_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -166,7 +166,7 @@ op_mul_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi
}
static RGBA_Gfx_Func
-op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP;
@@ -182,7 +182,7 @@ op_mul_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_mul_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_mul_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP;
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_.c b/src/lib/evas/common/evas_op_sub/op_sub_color_.c
index 4b71e42e5..4b71e42e5 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_color_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_color_i386.c
index d8fbbea16..d8fbbea16 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_color_i386.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_.c b/src/lib/evas/common/evas_op_sub/op_sub_mask_color_.c
index 88afca454..88afca454 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_mask_color_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c
index 972a2c9f0..972a2c9f0 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_mask_color_i386.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_.c
index a33afc2fe..a33afc2fe 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_pixel_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_color_.c
index af160529c..af160529c 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_pixel_color_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c
index e3c1793be..e3c1793be 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_color_i386.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_i386.c
index 95e2ab6cb..95e2ab6cb 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_i386.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_pixel_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c
index 371869799..371869799 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_i386.c b/src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c
index bfd145e23..bfd145e23 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub/op_sub_pixel_mask_i386.c
+++ b/src/lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c
diff --git a/legacy/evas/src/lib/engines/common/evas_op_sub_main_.c b/src/lib/evas/common/evas_op_sub_main_.c
index 6f35d8caf..9301cacf6 100644
--- a/legacy/evas/src/lib/engines/common/evas_op_sub_main_.c
+++ b/src/lib/evas/common/evas_op_sub_main_.c
@@ -139,7 +139,7 @@ sub_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -151,7 +151,7 @@ op_sub_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -167,7 +167,7 @@ op_sub_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -185,7 +185,7 @@ op_sub_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pi
}
static RGBA_Gfx_Func
-op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
@@ -201,7 +201,7 @@ op_sub_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_sub_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
@@ -363,7 +363,7 @@ sub_rel_gfx_span_func_cpu(int s, int m, int c, int d)
}
static RGBA_Gfx_Func
-op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_N, d = DP_AN;
@@ -375,7 +375,7 @@ op_sub_rel_pixel_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED_
}
static RGBA_Gfx_Func
-op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_N, c = SC_AN, d = DP_AN;
@@ -391,7 +391,7 @@ op_sub_rel_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
}
static RGBA_Gfx_Func
-op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_N, c = SC_AN, d = DP_AN;
@@ -409,7 +409,7 @@ op_sub_rel_pixel_color_span_get(RGBA_Image *src, DATA32 col, RGBA_Image *dst, in
}
static RGBA_Gfx_Func
-op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_N, m = SM_AS, c = SC_AN, d = DP_AN;
@@ -425,7 +425,7 @@ op_sub_rel_mask_color_span_get(DATA32 col, RGBA_Image *dst, int pixels __UNUSED_
}
static RGBA_Gfx_Func
-op_sub_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels __UNUSED__)
+op_sub_rel_pixel_mask_span_get(RGBA_Image *src, RGBA_Image *dst, int pixels EINA_UNUSED)
{
int s = SP_AN, m = SM_AS, c = SC_N, d = DP_AN;
diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c
index 0d4734df0..2466dc0ca 100644
--- a/legacy/evas/src/lib/engines/common/evas_pipe.c
+++ b/src/lib/evas/common/evas_pipe.c
@@ -610,7 +610,7 @@ evas_common_pipe_map_draw_do(RGBA_Image *dst, const RGBA_Pipe_Op *op, const RGBA
}
static Eina_Bool
-evas_common_pipe_map_draw_prepare(void *data __UNUSED__, RGBA_Image *dst, RGBA_Pipe_Op *op)
+evas_common_pipe_map_draw_prepare(void *data EINA_UNUSED, RGBA_Image *dst, RGBA_Pipe_Op *op)
{
RGBA_Draw_Context context;
Eina_Bool r;
diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.h b/src/lib/evas/common/evas_pipe.h
index a2fdb1727..a2fdb1727 100644
--- a/legacy/evas/src/lib/engines/common/evas_pipe.h
+++ b/src/lib/evas/common/evas_pipe.h
diff --git a/legacy/evas/src/lib/engines/common/evas_polygon.h b/src/lib/evas/common/evas_polygon.h
index 0695f5427..0695f5427 100644
--- a/legacy/evas/src/lib/engines/common/evas_polygon.h
+++ b/src/lib/evas/common/evas_polygon.h
diff --git a/legacy/evas/src/lib/engines/common/evas_polygon_main.c b/src/lib/evas/common/evas_polygon_main.c
index f6c79c837..f6c79c837 100644
--- a/legacy/evas/src/lib/engines/common/evas_polygon_main.c
+++ b/src/lib/evas/common/evas_polygon_main.c
diff --git a/legacy/evas/src/lib/engines/common/evas_rectangle.h b/src/lib/evas/common/evas_rectangle.h
index 8fdcb774c..8fdcb774c 100644
--- a/legacy/evas/src/lib/engines/common/evas_rectangle.h
+++ b/src/lib/evas/common/evas_rectangle.h
diff --git a/legacy/evas/src/lib/engines/common/evas_rectangle_main.c b/src/lib/evas/common/evas_rectangle_main.c
index 33fb053ac..33fb053ac 100644
--- a/legacy/evas/src/lib/engines/common/evas_rectangle_main.c
+++ b/src/lib/evas/common/evas_rectangle_main.c
diff --git a/legacy/evas/src/lib/engines/common/evas_regionbuf.c b/src/lib/evas/common/evas_regionbuf.c
index f381da5cc..f381da5cc 100644
--- a/legacy/evas/src/lib/engines/common/evas_regionbuf.c
+++ b/src/lib/evas/common/evas_regionbuf.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_main.c b/src/lib/evas/common/evas_scale_main.c
index bb11c6bde..8ccfe706c 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_main.c
+++ b/src/lib/evas/common/evas_scale_main.c
@@ -7,7 +7,7 @@ evas_common_scale_init(void)
}
EAPI Eina_Bool
-evas_common_scale_rgba_in_to_out_clip_prepare(Cutout_Rects *reuse, const RGBA_Image *src __UNUSED__,
+evas_common_scale_rgba_in_to_out_clip_prepare(Cutout_Rects *reuse, const RGBA_Image *src EINA_UNUSED,
const RGBA_Image *dst,
RGBA_Draw_Context *dc,
int dst_region_x, int dst_region_y,
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_main.h b/src/lib/evas/common/evas_scale_main.h
index e2ef8fa9c..e2ef8fa9c 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_main.h
+++ b/src/lib/evas/common/evas_scale_main.h
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c
index f78aad387..f78aad387 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_sample.c
+++ b/src/lib/evas/common/evas_scale_sample.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth.c b/src/lib/evas/common/evas_scale_smooth.c
index e4dfd2cc6..e4dfd2cc6 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth.c
+++ b/src/lib/evas/common/evas_scale_smooth.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth.h b/src/lib/evas/common/evas_scale_smooth.h
index 913190f0c..913190f0c 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth.h
+++ b/src/lib/evas/common/evas_scale_smooth.h
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c b/src/lib/evas/common/evas_scale_smooth_scaler.c
index 599bfda9f..599bfda9f 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_down.c b/src/lib/evas/common/evas_scale_smooth_scaler_down.c
index 357eb322c..357eb322c 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_down.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler_down.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c b/src/lib/evas/common/evas_scale_smooth_scaler_downx.c
index 544b8c271..544b8c271 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler_downx.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c b/src/lib/evas/common/evas_scale_smooth_scaler_downx_downy.c
index 180d37bca..180d37bca 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx_downy.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler_downx_downy.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c b/src/lib/evas/common/evas_scale_smooth_scaler_downy.c
index d7c10f95f..d7c10f95f 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler_downy.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_noscale.c b/src/lib/evas/common/evas_scale_smooth_scaler_noscale.c
index 4f7d06b7f..4f7d06b7f 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_noscale.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler_noscale.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_up.c b/src/lib/evas/common/evas_scale_smooth_scaler_up.c
index 2f323bd97..2f323bd97 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_smooth_scaler_up.c
+++ b/src/lib/evas/common/evas_scale_smooth_scaler_up.c
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_span.c b/src/lib/evas/common/evas_scale_span.c
index e0fefb24a..5182a97c3 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_span.c
+++ b/src/lib/evas/common/evas_scale_span.c
@@ -3,7 +3,7 @@
#include "evas_scale_span.h"
static void
-evas_common_scale_rgba_span_(DATA32 *src, DATA8 *mask __UNUSED__, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
+evas_common_scale_rgba_span_(DATA32 *src, DATA8 *mask EINA_UNUSED, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
{
int mul = 0, step = 1;
DATA32 *pdst = dst;
@@ -234,7 +234,7 @@ evas_common_scale_rgba_a8_span_(DATA32 *src, DATA8 *mask, int src_len, DATA32 mu
}
static void
-evas_common_scale_a8_span_(DATA32 *src __UNUSED__, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
+evas_common_scale_a8_span_(DATA32 *src EINA_UNUSED, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
{
int step = 1;
DATA32 *pdst = dst;
@@ -309,7 +309,7 @@ evas_common_scale_a8_span_(DATA32 *src __UNUSED__, DATA8 *mask, int src_len, DAT
}
static void
-evas_common_scale_clip_a8_span_(DATA32 *src __UNUSED__, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
+evas_common_scale_clip_a8_span_(DATA32 *src EINA_UNUSED, DATA8 *mask, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
{
int mul = 0, step = 1;
DATA32 *pdst = dst;
@@ -476,7 +476,7 @@ evas_common_scale_clip_a8_span(DATA32 *src, DATA8 *mask, int src_len, DATA32 mul
}
EAPI void
-evas_common_scale_hsva_span(DATA32 *src, DATA8 *mask __UNUSED__, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
+evas_common_scale_hsva_span(DATA32 *src, DATA8 *mask EINA_UNUSED, int src_len, DATA32 mul_col, DATA32 *dst, int dst_len, int dir)
{
int mul = 0, step = 1;
DATA32 *pdst = dst;
diff --git a/legacy/evas/src/lib/engines/common/evas_scale_span.h b/src/lib/evas/common/evas_scale_span.h
index 874c594b5..874c594b5 100644
--- a/legacy/evas/src/lib/engines/common/evas_scale_span.h
+++ b/src/lib/evas/common/evas_scale_span.h
diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index acdcc0042..acdcc0042 100644
--- a/legacy/evas/src/lib/engines/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.h b/src/lib/evas/common/evas_text_utils.h
index 675df6c20..675df6c20 100644
--- a/legacy/evas/src/lib/engines/common/evas_text_utils.h
+++ b/src/lib/evas/common/evas_text_utils.h
diff --git a/legacy/evas/src/lib/engines/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c
index bc5e99c44..bd16d1233 100644
--- a/legacy/evas/src/lib/engines/common/evas_tiler.c
+++ b/src/lib/evas/common/evas_tiler.c
@@ -1108,7 +1108,7 @@ evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h)
}
EAPI int
-evas_common_tilebuf_add_motion_vector(Tilebuf *tb __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dx __UNUSED__, int dy __UNUSED__, int alpha __UNUSED__)
+evas_common_tilebuf_add_motion_vector(Tilebuf *tb EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dx EINA_UNUSED, int dy EINA_UNUSED, int alpha EINA_UNUSED)
{
#ifdef EVAS_RECT_SPLIT
/* motion vector handling never has been used -> disable it
diff --git a/legacy/evas/src/lib/engines/common/language/evas_bidi_utils.c b/src/lib/evas/common/language/evas_bidi_utils.c
index 002cfbe6c..002cfbe6c 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_bidi_utils.c
+++ b/src/lib/evas/common/language/evas_bidi_utils.c
diff --git a/legacy/evas/src/lib/engines/common/language/evas_bidi_utils.h b/src/lib/evas/common/language/evas_bidi_utils.h
index f1a374b7e..f1a374b7e 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_bidi_utils.h
+++ b/src/lib/evas/common/language/evas_bidi_utils.h
diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c b/src/lib/evas/common/language/evas_language_utils.c
index b362f10b1..b362f10b1 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.c
+++ b/src/lib/evas/common/language/evas_language_utils.c
diff --git a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h b/src/lib/evas/common/language/evas_language_utils.h
index fa795eca4..fa795eca4 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_language_utils.h
+++ b/src/lib/evas/common/language/evas_language_utils.h
diff --git a/legacy/evas/src/lib/engines/common/language/evas_script_table.h b/src/lib/evas/common/language/evas_script_table.h
index dd77db04e..dd77db04e 100644
--- a/legacy/evas/src/lib/engines/common/language/evas_script_table.h
+++ b/src/lib/evas/common/language/evas_script_table.h
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h
index fc83a9276..fc83a9276 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2.h
+++ b/src/lib/evas/cserve2/evas_cs2.h
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index df45b0acf..d49ed5641 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -473,7 +473,7 @@ _build_absolute_path(const char *path, char buf[], int size)
}
static unsigned int
-_image_open_server_send(Image_Entry *ie, const char *file, const char *key, RGBA_Image_Loadopts *lopt __UNUSED__)
+_image_open_server_send(Image_Entry *ie, const char *file, const char *key, RGBA_Image_Loadopts *lopt EINA_UNUSED)
{
int flen, klen;
int size;
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_image_data.c b/src/lib/evas/cserve2/evas_cs2_image_data.c
index a5e49da39..a5e49da39 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_image_data.c
+++ b/src/lib/evas/cserve2/evas_cs2_image_data.c
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_private.h b/src/lib/evas/cserve2/evas_cs2_private.h
index 4373bfdab..4373bfdab 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_private.h
+++ b/src/lib/evas/cserve2/evas_cs2_private.h
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_utils.c b/src/lib/evas/cserve2/evas_cs2_utils.c
index b1a3df28e..b1a3df28e 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_utils.c
+++ b/src/lib/evas/cserve2/evas_cs2_utils.c
diff --git a/legacy/evas/src/lib/cserve2/evas_cs2_utils.h b/src/lib/evas/cserve2/evas_cs2_utils.h
index fb37f35d8..fb37f35d8 100644
--- a/legacy/evas/src/lib/cserve2/evas_cs2_utils.h
+++ b/src/lib/evas/cserve2/evas_cs2_utils.h
diff --git a/legacy/evas/src/lib/file/evas_module.c b/src/lib/evas/file/evas_module.c
index de2003537..de2003537 100644
--- a/legacy/evas/src/lib/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
diff --git a/legacy/evas/src/lib/file/evas_module.h b/src/lib/evas/file/evas_module.h
index 8699b6bcb..8699b6bcb 100644
--- a/legacy/evas/src/lib/file/evas_module.h
+++ b/src/lib/evas/file/evas_module.h
diff --git a/legacy/evas/src/lib/file/evas_path.c b/src/lib/evas/file/evas_path.c
index 2ff646dd6..2ff646dd6 100644
--- a/legacy/evas/src/lib/file/evas_path.c
+++ b/src/lib/evas/file/evas_path.c
diff --git a/legacy/evas/src/lib/file/evas_path.h b/src/lib/evas/file/evas_path.h
index e0aa6bb4d..e0aa6bb4d 100644
--- a/legacy/evas/src/lib/file/evas_path.h
+++ b/src/lib/evas/file/evas_path.h
diff --git a/legacy/evas/src/lib/include/evas_blend_ops.h b/src/lib/evas/include/evas_blend_ops.h
index 6bd1f165e..828b2856a 100644
--- a/legacy/evas/src/lib/include/evas_blend_ops.h
+++ b/src/lib/evas/include/evas_blend_ops.h
@@ -1,12 +1,12 @@
#ifndef EVAS_BLEND_OPS_H
#define EVAS_BLEND_OPS_H
+#include "config.h"
+
#if defined BUILD_MMX || defined BUILD_SSE
#include "evas_mmx.h"
#endif
-#include "config.h"
-
#ifdef NEED_SSE3
# if defined BUILD_SSE3
# include <immintrin.h>
diff --git a/legacy/evas/src/lib/include/evas_common.h b/src/lib/evas/include/evas_common.h
index 85a455d93..e4cfff99e 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/src/lib/evas/include/evas_common.h
@@ -702,8 +702,8 @@ struct _RGBA_Draw_Context
};
#ifdef BUILD_PIPE_RENDER
-#include "../engines/common/evas_map_image.h"
-#include "../engines/common/evas_text_utils.h"
+#include "../common/evas_map_image.h"
+#include "../common/evas_text_utils.h"
struct _RGBA_Pipe_Op
{
@@ -917,7 +917,7 @@ struct _RGBA_Font
unsigned char sizeok : 1;
};
-#include "../engines/common/evas_font_ot.h"
+#include "../common/evas_font_ot.h"
struct _RGBA_Font_Int
{
@@ -1203,26 +1203,26 @@ EAPI void evas_common_cpu_can_do (int *mmx, int *sse, int
EAPI void evas_common_cpu_end_opt (void);
/****/
-#include "../engines/common/evas_blend.h"
+#include "../common/evas_blend.h"
EAPI Gfx_Func_Copy evas_common_draw_func_copy_get (int pixels, int reverse);
/****/
-#include "../engines/common/evas_convert_color.h"
-#include "../engines/common/evas_convert_colorspace.h"
-#include "../engines/common/evas_convert_main.h"
-#include "../engines/common/evas_convert_yuv.h"
-#include "../engines/common/evas_scale_main.h"
-#include "../engines/common/evas_scale_smooth.h"
-#include "../engines/common/evas_scale_span.h"
+#include "../common/evas_convert_color.h"
+#include "../common/evas_convert_colorspace.h"
+#include "../common/evas_convert_main.h"
+#include "../common/evas_convert_yuv.h"
+#include "../common/evas_scale_main.h"
+#include "../common/evas_scale_smooth.h"
+#include "../common/evas_scale_span.h"
/****/
-#include "../engines/common/evas_image.h"
+#include "../common/evas_image.h"
/****/
-#include "../engines/common/evas_line.h"
-#include "../engines/common/evas_polygon.h"
-#include "../engines/common/evas_rectangle.h"
+#include "../common/evas_line.h"
+#include "../common/evas_polygon.h"
+#include "../common/evas_rectangle.h"
/****/
EAPI void evas_common_blit_init (void);
@@ -1230,7 +1230,7 @@ EAPI void evas_common_blit_init (void);
EAPI void evas_common_blit_rectangle (const RGBA_Image *src, RGBA_Image *dst, int src_x, int src_y, int w, int h, int dst_x, int dst_y);
/****/
-#include "../engines/common/evas_font.h"
+#include "../common/evas_font.h"
/****/
EAPI void evas_common_tilebuf_init (void);
@@ -1256,12 +1256,12 @@ Tilebuf_Rect *evas_common_regionbuf_rects_get (Regionbuf *rb);
*/
/****/
-#include "../engines/common/evas_draw.h"
+#include "../common/evas_draw.h"
-#include "../engines/common/evas_map_image.h"
+#include "../common/evas_map_image.h"
/****/
-#include "../engines/common/evas_pipe.h"
+#include "../common/evas_pipe.h"
void evas_font_dir_cache_free(void);
diff --git a/legacy/evas/src/lib/include/evas_inline.x b/src/lib/evas/include/evas_inline.x
index 4ad3727b8..8d72291f8 100644
--- a/legacy/evas/src/lib/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -79,7 +79,7 @@ evas_object_is_opaque(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
}
static inline int
-evas_event_freezes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj)
+evas_event_freezes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
if (obj->freeze_events) return 1;
if (obj->parent_cache.freeze_events_valid)
@@ -93,7 +93,7 @@ evas_event_freezes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected
}
static inline int
-evas_event_passes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj)
+evas_event_passes_through(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
if (obj->pass_events) return 1;
if (obj->parent_cache.pass_events_valid)
@@ -107,7 +107,7 @@ evas_event_passes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_
}
static inline int
-evas_object_is_source_invisible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj)
+evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
if (obj->parent_cache.src_invisible_valid)
return obj->parent_cache.src_invisible;
@@ -137,7 +137,7 @@ evas_object_is_visible(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
}
static inline int
-evas_object_clippers_is_visible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj)
+evas_object_clippers_is_visible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
if (obj->cur.visible)
{
@@ -152,7 +152,7 @@ evas_object_clippers_is_visible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Prot
}
static inline int
-evas_object_is_in_output_rect(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj, int x, int y, int w, int h)
+evas_object_is_in_output_rect(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, int x, int y, int w, int h)
{
/* assumes coords have been recalced */
if ((RECTS_INTERSECT(x, y, w, h,
diff --git a/legacy/evas/src/lib/include/evas_macros.h b/src/lib/evas/include/evas_macros.h
index ed29dbd75..ed29dbd75 100644
--- a/legacy/evas/src/lib/include/evas_macros.h
+++ b/src/lib/evas/include/evas_macros.h
diff --git a/legacy/evas/src/lib/include/evas_mmx.h b/src/lib/evas/include/evas_mmx.h
index e1095e1f7..e1095e1f7 100644
--- a/legacy/evas/src/lib/include/evas_mmx.h
+++ b/src/lib/evas/include/evas_mmx.h
diff --git a/legacy/evas/src/lib/include/evas_options.h b/src/lib/evas/include/evas_options.h
index d7af99f79..d7af99f79 100644
--- a/legacy/evas/src/lib/include/evas_options.h
+++ b/src/lib/evas/include/evas_options.h
diff --git a/legacy/evas/src/lib/include/evas_private.h b/src/lib/evas/include/evas_private.h
index e6536fdad..357eae0cb 100644
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -7,18 +7,15 @@
#include <Eina.h>
#include <eina_safety_checks.h>
+
#include "Evas.h"
#include "../file/evas_module.h"
#include "../file/evas_path.h"
-#include "../engines/common/evas_text_utils.h"
-#include "../engines/common/language/evas_bidi_utils.h"
-#include "../engines/common/language/evas_language_utils.h"
+#include "../common/evas_text_utils.h"
+#include "../common/language/evas_bidi_utils.h"
+#include "../common/language/evas_language_utils.h"
-#ifdef EVAS_MAGIC_DEBUG
-/* complain when peole pass in wrong object types etc. */
-# define MAGIC_DEBUG
-#endif
#define RENDER_METHOD_INVALID 0x00000000
@@ -124,7 +121,7 @@ OPAQUE_TYPE(Evas_Font_Instance); /* General type for RGBA_Font_Int */
#define MAGIC_MAP 0x7575177d
#define MAGIC_DEV 0x7d773738
-#ifdef MAGIC_DEBUG
+#ifdef EINA_MAGIC_DEBUG
# define MAGIC_CHECK_FAILED(o, t, m) \
{evas_debug_error(); \
if (!o) evas_debug_input_null(); \
@@ -903,7 +900,7 @@ struct _Evas_Func
void (*image_content_hint_set) (void *data, void *surface, int hint);
int (*image_content_hint_get) (void *data, void *surface);
int (*font_pen_coords_get) (void *data, Evas_Font_Set *font, const Evas_Text_Props *intl_props, int pos, int *cpen_x, int *cy, int *cadv, int *ch);
- Eina_Bool (*font_text_props_info_create) (void *data __UNUSED__, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *intl_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len, Evas_Text_Props_Mode mode);
+ Eina_Bool (*font_text_props_info_create) (void *data, Evas_Font_Instance *fi, const Eina_Unicode *text, Evas_Text_Props *intl_props, const Evas_BiDi_Paragraph_Props *par_props, size_t pos, size_t len, Evas_Text_Props_Mode mode);
int (*font_right_inset_get) (void *data, Evas_Font_Set *font, const Evas_Text_Props *text_props);
#if 0 // filtering disabled
diff --git a/legacy/evas/src/lib/main.c b/src/lib/evas/main.c
index 043197758..604c14d99 100644
--- a/legacy/evas/src/lib/main.c
+++ b/src/lib/evas/main.c
@@ -21,14 +21,14 @@ evas_alloc_error(void)
/* free cached items only in ram for speed reasons. return 0 if can't free */
int
-evas_mem_free(int mem_required __UNUSED__)
+evas_mem_free(int mem_required EINA_UNUSED)
{
return 0;
}
/* start reducing quality of images etc. return 0 if can't free anything */
int
-evas_mem_degrade(int mem_required __UNUSED__)
+evas_mem_degrade(int mem_required EINA_UNUSED)
{
return 0;
}
diff --git a/legacy/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h b/src/modules/evas/engines/buffer/Evas_Engine_Buffer.h
index a9cbbfbf4..a9cbbfbf4 100644
--- a/legacy/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h
+++ b/src/modules/evas/engines/buffer/Evas_Engine_Buffer.h
diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index 3e12a7e77..f492ba9ae 100644
--- a/legacy/evas/src/modules/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -32,8 +32,8 @@ struct _Render_Engine
/* prototypes we will use here */
static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data);
-static void *eng_info(Evas *eo_e __UNUSED__);
-static void eng_info_free(Evas *eo_e __UNUSED__, void *info);
+static void *eng_info(Evas *eo_e EINA_UNUSED);
+static void eng_info_free(Evas *eo_e EINA_UNUSED, void *info);
static int eng_setup(Evas *eo_e, void *info);
static void eng_output_free(void *data);
static void eng_output_resize(void *data, int w, int h);
@@ -125,7 +125,7 @@ _output_setup(int w,
/* engine api this module provides */
static void *
-eng_info(Evas *eo_e __UNUSED__)
+eng_info(Evas *eo_e EINA_UNUSED)
{
Evas_Engine_Info_Buffer *info;
info = calloc(1, sizeof(Evas_Engine_Info_Buffer));
@@ -136,7 +136,7 @@ eng_info(Evas *eo_e __UNUSED__)
}
static void
-eng_info_free(Evas *eo_e __UNUSED__, void *info)
+eng_info_free(Evas *eo_e EINA_UNUSED, void *info)
{
Evas_Engine_Info_Buffer *in;
in = (Evas_Engine_Info_Buffer *)info;
@@ -366,12 +366,12 @@ eng_output_flush(void *data)
}
static void
-eng_output_idle_flush(void *data __UNUSED__)
+eng_output_idle_flush(void *data EINA_UNUSED)
{
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context __UNUSED__)
+eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
{
Render_Engine *re;
@@ -421,7 +421,7 @@ module_open(Evas_Module *em)
}
static void
-module_close(Evas_Module *em __UNUSED__)
+module_close(Evas_Module *em EINA_UNUSED)
{
eina_log_domain_unregister(_evas_engine_buffer_log_dom);
}
diff --git a/legacy/evas/src/modules/engines/buffer/evas_engine.h b/src/modules/evas/engines/buffer/evas_engine.h
index af824776a..af824776a 100644
--- a/legacy/evas/src/modules/engines/buffer/evas_engine.h
+++ b/src/modules/evas/engines/buffer/evas_engine.h
diff --git a/legacy/evas/src/modules/engines/buffer/evas_outbuf.c b/src/modules/evas/engines/buffer/evas_outbuf.c
index fc1ffba93..fc1ffba93 100644
--- a/legacy/evas/src/modules/engines/buffer/evas_outbuf.c
+++ b/src/modules/evas/engines/buffer/evas_outbuf.c
diff --git a/legacy/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h b/src/modules/evas/engines/direct3d/Evas_Engine_Direct3D.h
index f9b7a9c59..f9b7a9c59 100644
--- a/legacy/evas/src/modules/engines/direct3d/Evas_Engine_Direct3D.h
+++ b/src/modules/evas/engines/direct3d/Evas_Engine_Direct3D.h
diff --git a/legacy/evas/src/modules/engines/direct3d/array.h b/src/modules/evas/engines/direct3d/array.h
index dfd80b723..dfd80b723 100644
--- a/legacy/evas/src/modules/engines/direct3d/array.h
+++ b/src/modules/evas/engines/direct3d/array.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_buffer.c b/src/modules/evas/engines/direct3d/evas_direct3d_buffer.c
index e69de29bb..e69de29bb 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_buffer.c
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_buffer.c
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_context.cpp
index 07cfa3d08..07cfa3d08 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_context.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.h b/src/modules/evas/engines/direct3d/evas_direct3d_context.h
index 763d1890b..763d1890b 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_context.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_context.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_device.cpp
index ce0d98556..ce0d98556 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_device.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.h b/src/modules/evas/engines/direct3d/evas_direct3d_device.h
index c5a4b49b6..c5a4b49b6 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_device.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_device.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp
index aa44eb9cb..aa44eb9cb 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h b/src/modules/evas/engines/direct3d/evas_direct3d_image_cache.h
index 6fb4c1812..6fb4c1812 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_image_cache.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_image_cache.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_main.cpp
index fe1e13f83..fe1e13f83 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_main.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_main.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object.cpp
index 15a801e0a..15a801e0a 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.h b/src/modules/evas/engines/direct3d/evas_direct3d_object.h
index 8c4e6df20..8c4e6df20 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_font.cpp
index f072e8752..f072e8752 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_font.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_font.h
index e8c019682..e8c019682 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_font.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_font.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_image.cpp
index 3bfbe1e56..3bfbe1e56 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_image.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_image.h
index 379207b11..379207b11 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_image.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_image.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_line.cpp
index 9442243ab..9442243ab 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_line.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_line.h
index 0e5d8078d..0e5d8078d 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_line.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_line.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp
index ebdd22be9..ebdd22be9 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h b/src/modules/evas/engines/direct3d/evas_direct3d_object_rect.h
index f7ef084ab..f7ef084ab 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_object_rect.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_object_rect.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_scene.cpp
index b171fc0d8..b171fc0d8 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_scene.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.h b/src/modules/evas/engines/direct3d/evas_direct3d_scene.h
index e2f5f944c..e2f5f944c 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_scene.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_scene.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp
index d9c868f9b..d9c868f9b 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h b/src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.h
index b865f783e..b865f783e 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_shader_pack.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_shader_pack.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp b/src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp
index 8d3dd451a..8d3dd451a 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h b/src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h
index 822ac8022..822ac8022 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_direct3d_vertex_buffer_cache.h
+++ b/src/modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.h
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_engine.c b/src/modules/evas/engines/direct3d/evas_engine.c
index 159f5c5f8..d66a7fec7 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_engine.c
+++ b/src/modules/evas/engines/direct3d/evas_engine.c
@@ -379,12 +379,12 @@ eng_image_border_get(void *data, void *image, int *l, int *r, int *t, int *b)
}
static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
+eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint)
{
}
static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
+eng_image_scale_hint_get(void *data EINA_UNUSED, void *image)
{
return EVAS_IMAGE_SCALE_HINT_NONE;
}
diff --git a/legacy/evas/src/modules/engines/direct3d/evas_engine.h b/src/modules/evas/engines/direct3d/evas_engine.h
index da1ebff1d..da1ebff1d 100644
--- a/legacy/evas/src/modules/engines/direct3d/evas_engine.h
+++ b/src/modules/evas/engines/direct3d/evas_engine.h
diff --git a/legacy/evas/src/modules/engines/direct3d/ref.h b/src/modules/evas/engines/direct3d/ref.h
index 0853f2e1a..0853f2e1a 100644
--- a/legacy/evas/src/modules/engines/direct3d/ref.h
+++ b/src/modules/evas/engines/direct3d/ref.h
diff --git a/legacy/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h b/src/modules/evas/engines/directfb/Evas_Engine_DirectFB.h
index 53352b77c..53352b77c 100644
--- a/legacy/evas/src/modules/engines/directfb/Evas_Engine_DirectFB.h
+++ b/src/modules/evas/engines/directfb/Evas_Engine_DirectFB.h
diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.c b/src/modules/evas/engines/directfb/evas_engine.c
index ec4cc6583..3dc599f4e 100644
--- a/legacy/evas/src/modules/engines/directfb/evas_engine.c
+++ b/src/modules/evas/engines/directfb/evas_engine.c
@@ -531,7 +531,7 @@ evas_cache_image_dfb_dirty(Engine_Image_Entry *dst, const Engine_Image_Entry *sr
}
static void
-evas_cache_image_dfb_dirty_region(Engine_Image_Entry *eim, unsigned int x __UNUSED__, unsigned int y __UNUSED__, unsigned int w __UNUSED__, unsigned int h __UNUSED__)
+evas_cache_image_dfb_dirty_region(Engine_Image_Entry *eim, unsigned int x EINA_UNUSED, unsigned int y EINA_UNUSED, unsigned int w EINA_UNUSED, unsigned int h EINA_UNUSED)
{
RGBA_Image *im;
@@ -665,7 +665,7 @@ static const Evas_Cache_Engine_Image_Func _dfb_cache_engine_image_cb = {
* Evas Engine
**********************************************************************/
static void *
-evas_engine_dfb_info(Evas* e __UNUSED__)
+evas_engine_dfb_info(Evas* e EINA_UNUSED)
{
Evas_Engine_Info_DirectFB *info;
info = calloc(1, sizeof(Evas_Engine_Info_DirectFB));
@@ -676,7 +676,7 @@ evas_engine_dfb_info(Evas* e __UNUSED__)
}
static void
-evas_engine_dfb_info_free(Evas *e __UNUSED__, void *in)
+evas_engine_dfb_info_free(Evas *e EINA_UNUSED, void *in)
{
Evas_Engine_Info_DirectFB *info = in;
free(info);
@@ -946,7 +946,7 @@ evas_engine_dfb_output_redraws_next_update_get(void *data, int *x, int *y, int *
}
static void
-evas_engine_dfb_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
+evas_engine_dfb_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x, int y, int w, int h)
{
Render_Engine *re = data;
DFBRegion *r;
@@ -1037,7 +1037,7 @@ evas_engine_dfb_output_idle_flush(void *data)
* memory.
*/
static void
-evas_engine_dfb_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font __UNUSED__, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props)
+evas_engine_dfb_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font EINA_UNUSED, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props)
{
DirectFB_Engine_Image_Entry *eim = surface;
IDirectFBSurface *screen;
@@ -1060,7 +1060,7 @@ evas_engine_dfb_font_draw(void *data, void *context, void *surface, Evas_Font_Se
static void
-_cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
+_cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data)
{
const Eina_Rectangle *r = data;
@@ -1068,7 +1068,7 @@ _cb_draw_line(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const
}
static void
-evas_engine_dfb_line_draw(void *data __UNUSED__, void *context, void *surface, int x1, int y1, int x2, int y2)
+evas_engine_dfb_line_draw(void *data EINA_UNUSED, void *context, void *surface, int x1, int y1, int x2, int y2)
{
DirectFB_Engine_Image_Entry *eim = surface;
Eina_Rectangle r;
@@ -1082,7 +1082,7 @@ evas_engine_dfb_line_draw(void *data __UNUSED__, void *context, void *surface, i
#ifndef DFB_USE_EVAS_RECT_DRAW
static void
-_cb_draw_rectangle(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
+_cb_draw_rectangle(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data)
{
const Eina_Rectangle *r = data;
@@ -1137,7 +1137,7 @@ evas_engine_dfb_rectangle_draw(void *data, void *context, void *surface, int x,
#ifndef DFB_USE_EVAS_POLYGON_DRAW
static void
-evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y)
+evas_engine_dfb_polygon_draw(void *data EINA_UNUSED, void *context, void *surface, void *polygon, int x, int y)
{
DirectFB_Engine_Image_Entry *eim = surface;
_dfb_polygon_draw(eim->surface, context, polygon, x, y);
@@ -1177,7 +1177,7 @@ evas_engine_dfb_image_load(void *data, const char *file, const char *key, int *e
}
static int
-evas_engine_dfb_image_alpha_get(void *data __UNUSED__, void *image)
+evas_engine_dfb_image_alpha_get(void *data EINA_UNUSED, void *image)
{
DirectFB_Engine_Image_Entry *eim = image;
Image_Entry *ie;
@@ -1197,7 +1197,7 @@ evas_engine_dfb_image_alpha_get(void *data __UNUSED__, void *image)
}
static void
-evas_engine_dfb_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
+evas_engine_dfb_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h)
{
DirectFB_Engine_Image_Entry *eim = image;
Image_Entry *ie;
@@ -1208,7 +1208,7 @@ evas_engine_dfb_image_size_get(void *data __UNUSED__, void *image, int *w, int *
}
static int
-evas_engine_dfb_image_colorspace_get(void *data __UNUSED__, void *image)
+evas_engine_dfb_image_colorspace_get(void *data EINA_UNUSED, void *image)
{
DirectFB_Engine_Image_Entry *eim = image;
@@ -1246,7 +1246,7 @@ evas_engine_dfb_image_new_from_data(void *data, int w, int h, DATA32* image_data
}
static void
-evas_engine_dfb_image_free(void *data __UNUSED__, void *image)
+evas_engine_dfb_image_free(void *data EINA_UNUSED, void *image)
{
DirectFB_Engine_Image_Entry *eim = image;
@@ -1254,7 +1254,7 @@ evas_engine_dfb_image_free(void *data __UNUSED__, void *image)
}
static void *
-evas_engine_dfb_image_size_set(void *data __UNUSED__, void *image, int w, int h)
+evas_engine_dfb_image_size_set(void *data EINA_UNUSED, void *image, int w, int h)
{
DirectFB_Engine_Image_Entry *eim = image;
@@ -1262,7 +1262,7 @@ evas_engine_dfb_image_size_set(void *data __UNUSED__, void *image, int w, int h)
}
static void *
-evas_engine_dfb_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h)
+evas_engine_dfb_image_dirty_region(void *data EINA_UNUSED, void *image, int x, int y, int w, int h)
{
DirectFB_Engine_Image_Entry *eim = image;
@@ -1270,7 +1270,7 @@ evas_engine_dfb_image_dirty_region(void *data __UNUSED__, void *image, int x, in
}
static void *
-evas_engine_dfb_image_data_get(void *data __UNUSED__, void *image, int to_write, DATA32** image_data, int *err __UNUSED__)
+evas_engine_dfb_image_data_get(void *data EINA_UNUSED, void *image, int to_write, DATA32** image_data, int *err EINA_UNUSED)
{
DirectFB_Engine_Image_Entry *deie = image;
Engine_Image_Entry *ce;
@@ -1405,7 +1405,7 @@ evas_engine_dfb_image_data_put(void *data, void *image, DATA32* image_data)
}
static void
-evas_engine_dfb_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
+evas_engine_dfb_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
{
DirectFB_Engine_Image_Entry *deie = image;
RGBA_Image *im;
@@ -1417,7 +1417,7 @@ evas_engine_dfb_image_data_preload_request(void *data __UNUSED__, void *image, c
}
static void
-evas_engine_dfb_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
+evas_engine_dfb_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
{
DirectFB_Engine_Image_Entry *deie = image;
RGBA_Image *im;
@@ -1429,7 +1429,7 @@ evas_engine_dfb_image_data_preload_cancel(void *data __UNUSED__, void *image, co
}
static void *
-evas_engine_dfb_image_alpha_set(void *data __UNUSED__, void *image, int has_alpha)
+evas_engine_dfb_image_alpha_set(void *data EINA_UNUSED, void *image, int has_alpha)
{
DirectFB_Engine_Image_Entry *eim = image;
Engine_Image_Entry *ce;
@@ -1462,7 +1462,7 @@ struct _for_each_cutout_image
};
static void
-_cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
+_cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data)
{
const struct _for_each_cutout_image *p = data;
@@ -1470,7 +1470,7 @@ _cb_draw_image_unscaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSE
}
static void
-_cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED__, const DFBRegion *region __UNUSED__, void *data)
+_cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc EINA_UNUSED, const DFBRegion *region EINA_UNUSED, void *data)
{
const struct _for_each_cutout_image *p = data;
@@ -1479,7 +1479,7 @@ _cb_draw_image_scaled(IDirectFBSurface *surface, RGBA_Draw_Context *dc __UNUSED_
#ifndef DFB_USE_EVAS_IMAGE_DRAW
static void
-evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth __UNUSED__)
+evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int smooth EINA_UNUSED)
{
DirectFB_Engine_Image_Entry *eim = surface;
Render_Engine *re = data;
@@ -1555,7 +1555,7 @@ evas_engine_dfb_image_draw(void *data, void *context, void *surface, void *image
#endif
static void
-evas_engine_dfb_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level)
+evas_engine_dfb_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level)
{
Render_Engine *re = (Render_Engine*) data;
DirectFB_Engine_Image_Entry *deie = image;
@@ -1600,7 +1600,7 @@ evas_engine_dfb_image_map_surface_new(void *data, int w, int h, int alpha)
}
static void
-evas_engine_dfb_image_map_surface_free(void *data __UNUSED__, void *surface)
+evas_engine_dfb_image_map_surface_free(void *data EINA_UNUSED, void *surface)
{
evas_cache_engine_image_drop(surface);
}
@@ -1634,7 +1634,7 @@ evas_engine_dfb_image_cache_get(void *data)
}
static char *
-evas_engine_dfb_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
+evas_engine_dfb_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED)
{
DirectFB_Engine_Image_Entry *eim = image;
RGBA_Image *im;
@@ -1646,12 +1646,12 @@ evas_engine_dfb_image_comment_get(void *data __UNUSED__, void *image, char *key
}
static void
-evas_engine_dfb_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
+evas_engine_dfb_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint)
{
}
static int
-evas_engine_dfb_image_scale_hint_get(void *data __UNUSED__, void *image)
+evas_engine_dfb_image_scale_hint_get(void *data EINA_UNUSED, void *image)
{
return EVAS_IMAGE_SCALE_HINT_NONE;
}
diff --git a/legacy/evas/src/modules/engines/directfb/evas_engine.h b/src/modules/evas/engines/directfb/evas_engine.h
index 7ad1e3826..7ad1e3826 100644
--- a/legacy/evas/src/modules/engines/directfb/evas_engine.h
+++ b/src/modules/evas/engines/directfb/evas_engine.h
diff --git a/legacy/evas/src/modules/engines/directfb/polygon.c b/src/modules/evas/engines/directfb/polygon.c
index 715fd840c..d040c9d9d 100644
--- a/legacy/evas/src/modules/engines/directfb/polygon.c
+++ b/src/modules/evas/engines/directfb/polygon.c
@@ -82,7 +82,7 @@ polygon_edge_sorter(const void *a, const void *b)
typedef DFBSpan span_t;
static void
-polygon_span_add(span_t *span, int y __UNUSED__, int x, int w)
+polygon_span_add(span_t *span, int y EINA_UNUSED, int x, int w)
{
span->x = x;
span->w = w;
diff --git a/legacy/evas/src/modules/engines/fb/Evas_Engine_FB.h b/src/modules/evas/engines/fb/Evas_Engine_FB.h
index b54823785..b54823785 100644
--- a/legacy/evas/src/modules/engines/fb/Evas_Engine_FB.h
+++ b/src/modules/evas/engines/fb/Evas_Engine_FB.h
diff --git a/legacy/evas/src/modules/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index 6e63e6fe6..6c934c586 100644
--- a/legacy/evas/src/modules/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -74,7 +74,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh)
/* engine api this module provides */
static void *
-eng_info(Evas *eo_e __UNUSED__)
+eng_info(Evas *eo_e EINA_UNUSED)
{
Evas_Engine_Info_FB *info;
info = calloc(1, sizeof(Evas_Engine_Info_FB));
@@ -85,7 +85,7 @@ eng_info(Evas *eo_e __UNUSED__)
}
static void
-eng_info_free(Evas *eo_e __UNUSED__, void *info)
+eng_info_free(Evas *eo_e EINA_UNUSED, void *info)
{
Evas_Engine_Info_FB *in;
in = (Evas_Engine_Info_FB *)info;
@@ -231,17 +231,17 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int
}
static void
-eng_output_flush(void *data __UNUSED__)
+eng_output_flush(void *data EINA_UNUSED)
{
}
static void
-eng_output_idle_flush(void *data __UNUSED__)
+eng_output_idle_flush(void *data EINA_UNUSED)
{
}
static Eina_Bool
-eng_canvas_alpha_get(void *data, void *context __UNUSED__)
+eng_canvas_alpha_get(void *data, void *context EINA_UNUSED)
{
Render_Engine *re;
@@ -288,7 +288,7 @@ module_open(Evas_Module *em)
}
static void
-module_close(Evas_Module *em __UNUSED__)
+module_close(Evas_Module *em EINA_UNUSED)
{
eina_log_domain_unregister(_evas_engine_fb_log_dom);
}
diff --git a/legacy/evas/src/modules/engines/fb/evas_engine.h b/src/modules/evas/engines/fb/evas_engine.h
index 295e91e4b..295e91e4b 100644
--- a/legacy/evas/src/modules/engines/fb/evas_engine.h
+++ b/src/modules/evas/engines/fb/evas_engine.h
diff --git a/legacy/evas/src/modules/engines/fb/evas_fb.h b/src/modules/evas/engines/fb/evas_fb.h
index 76ab30b62..76ab30b62 100644
--- a/legacy/evas/src/modules/engines/fb/evas_fb.h
+++ b/src/modules/evas/engines/fb/evas_fb.h
diff --git a/legacy/evas/src/modules/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c
index 1d61f1a71..5cf2ac488 100644
--- a/legacy/evas/src/modules/engines/fb/evas_fb_main.c
+++ b/src/modules/evas/engines/fb/evas_fb_main.c
@@ -446,7 +446,7 @@ fb_setvt(int vtno)
*/
void
-fb_init(int vt __UNUSED__, int device)
+fb_init(int vt EINA_UNUSED, int device)
{
char dev[32];
diff --git a/legacy/evas/src/modules/engines/fb/evas_outbuf.c b/src/modules/evas/engines/fb/evas_outbuf.c
index 7ae24c5e1..7ae24c5e1 100644
--- a/legacy/evas/src/modules/engines/fb/evas_outbuf.c
+++ b/src/modules/evas/engines/fb/evas_outbuf.c
diff --git a/legacy/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h b/src/modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
index eb04d28d7..eb04d28d7 100644
--- a/legacy/evas/src/modules/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
+++ b/src/modules/evas/engines/gl_cocoa/Evas_Engine_GL_Cocoa.h
diff --git a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 7a28dd4b5..73c245f43 100644
--- a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -61,7 +61,7 @@ static Evas_GL_API gl_funcs;
static void *
-eng_info(Evas *e __UNUSED__)
+eng_info(Evas *e EINA_UNUSED)
{
Evas_Engine_Info_GL_Cocoa *info;
info = calloc(1, sizeof(Evas_Engine_Info_GL_Cocoa));
@@ -72,7 +72,7 @@ eng_info(Evas *e __UNUSED__)
}
static void
-eng_info_free(Evas *e __UNUSED__, void *info)
+eng_info_free(Evas *e EINA_UNUSED, void *info)
{
Evas_Engine_Info_GL_Cocoa *in;
@@ -171,7 +171,7 @@ eng_output_resize(void *data, int w, int h)
}
static void
-eng_output_tile_size_set(void *data __UNUSED__, int w __UNUSED__, int h __UNUSED__)
+eng_output_tile_size_set(void *data EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
{
DBG("tile size set");
}
@@ -212,7 +212,7 @@ eng_output_redraws_rect_add(void *data, int x, int y, int w, int h)
}
static void
-eng_output_redraws_rect_del(void *data __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
+eng_output_redraws_rect_del(void *data EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
{
}
@@ -278,7 +278,7 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i
}
static void
-eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x __UNUSED__, int y __UNUSED__, int w __UNUSED__, int h __UNUSED__)
+eng_output_redraws_next_update_push(void *data, void *surface EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
{
Render_Engine *re;
@@ -309,18 +309,18 @@ eng_output_flush(void *data)
}
static void
-eng_output_idle_flush(void *data __UNUSED__)
+eng_output_idle_flush(void *data EINA_UNUSED)
{
}
static void
-eng_context_cutout_add(void *data __UNUSED__, void *context, int x, int y, int w, int h)
+eng_context_cutout_add(void *data EINA_UNUSED, void *context, int x, int y, int w, int h)
{
evas_common_draw_context_add_cutout(context, x, y, w, h);
}
static void
-eng_context_cutout_clear(void *data __UNUSED__, void *context)
+eng_context_cutout_clear(void *data EINA_UNUSED, void *context)
{
evas_common_draw_context_clear_cutouts(context);
}
@@ -350,7 +350,7 @@ eng_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2,
}
static void *
-eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x, int y)
+eng_polygon_point_add(void *data, void *context EINA_UNUSED, void *polygon, int x, int y)
{
Render_Engine *re;
@@ -359,7 +359,7 @@ eng_polygon_point_add(void *data, void *context __UNUSED__, void *polygon, int x
}
static void *
-eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
+eng_polygon_points_clear(void *data, void *context EINA_UNUSED, void *polygon)
{
Render_Engine *re;
@@ -368,7 +368,7 @@ eng_polygon_points_clear(void *data, void *context __UNUSED__, void *polygon)
}
static void
-eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *polygon, int x, int y)
+eng_polygon_draw(void *data, void *context, void *surface EINA_UNUSED, void *polygon, int x, int y)
{
Render_Engine *re;
@@ -380,7 +380,7 @@ eng_polygon_draw(void *data, void *context, void *surface __UNUSED__, void *poly
}
static int
-eng_image_alpha_get(void *data __UNUSED__, void *image)
+eng_image_alpha_get(void *data EINA_UNUSED, void *image)
{
// Render_Engine *re;
Evas_GL_Image *im;
@@ -392,7 +392,7 @@ eng_image_alpha_get(void *data __UNUSED__, void *image)
}
static int
-eng_image_colorspace_get(void *data __UNUSED__, void *image)
+eng_image_colorspace_get(void *data EINA_UNUSED, void *image)
{
// Render_Engine *re;
Evas_GL_Image *im;
@@ -404,7 +404,7 @@ eng_image_colorspace_get(void *data __UNUSED__, void *image)
}
static void
-eng_image_mask_create(void *data __UNUSED__, void *image)
+eng_image_mask_create(void *data EINA_UNUSED, void *image)
{
Evas_GL_Image *im;
@@ -466,7 +466,7 @@ eng_image_alpha_set(void *data, void *image, int has_alpha)
}
static void *
-eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r __UNUSED__, int t __UNUSED__, int b __UNUSED__)
+eng_image_border_set(void *data EINA_UNUSED, void *image, int l EINA_UNUSED, int r EINA_UNUSED, int t EINA_UNUSED, int b EINA_UNUSED)
{
// Render_Engine *re;
//
@@ -475,7 +475,7 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r
}
static void
-eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__)
+eng_image_border_get(void *data EINA_UNUSED, void *image EINA_UNUSED, int *l EINA_UNUSED, int *r EINA_UNUSED, int *t EINA_UNUSED, int *b EINA_UNUSED)
{
// Render_Engine *re;
//
@@ -483,7 +483,7 @@ eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNU
}
static char *
-eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
+eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key EINA_UNUSED)
{
// Render_Engine *re;
Evas_GL_Image *im;
@@ -496,7 +496,7 @@ eng_image_comment_get(void *data __UNUSED__, void *image, char *key __UNUSED__)
}
static char *
-eng_image_format_get(void *data __UNUSED__, void *image)
+eng_image_format_get(void *data EINA_UNUSED, void *image)
{
// Render_Engine *re;
Evas_GL_Image *im;
@@ -646,7 +646,7 @@ eng_image_free(void *data, void *image)
}
static void
-eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h)
+eng_image_size_get(void *data EINA_UNUSED, void *image, int *w, int *h)
{
if (!image)
{
@@ -874,7 +874,7 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data)
}
static void
-eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *target)
+eng_image_data_preload_request(void *data EINA_UNUSED, void *image, const void *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;
@@ -887,7 +887,7 @@ eng_image_data_preload_request(void *data __UNUSED__, void *image, const void *t
}
static void
-eng_image_data_preload_cancel(void *data __UNUSED__, void *image, const void *target)
+eng_image_data_preload_cancel(void *data EINA_UNUSED, void *image, const void *target)
{
Evas_GL_Image *gim = image;
RGBA_Image *im;
@@ -916,13 +916,13 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x,
}
static void
-eng_image_scale_hint_set(void *data __UNUSED__, void *image, int hint)
+eng_image_scale_hint_set(void *data EINA_UNUSED, void *image, int hint)
{
if (image) evas_gl_common_image_scale_hint_set(image, hint);
}
static int
-eng_image_scale_hint_get(void *data __UNUSED__, void *image)
+eng_image_scale_hint_get(void *data EINA_UNUSED, void *image)
{
Evas_GL_Image *gim = image;
if (!gim) return EVAS_IMAGE_SCALE_HINT_NONE;
@@ -930,7 +930,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image)
}
static void
-eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level)
+eng_image_map_draw(void *data EINA_UNUSED, void *context, void *surface, void *image, RGBA_Map *m, int smooth, int level)
{
Evas_GL_Image *gim = image;
Render_Engine *re;
@@ -981,7 +981,7 @@ eng_image_map_draw(void *data __UNUSED__, void *context, void *surface, void *im
}
static void *
-eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
+eng_image_map_surface_new(void *data EINA_UNUSED, int w, int h, int alpha)
{
Render_Engine *re;
@@ -990,19 +990,19 @@ eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha)
}
static void
-eng_image_map_surface_free(void *data __UNUSED__, void *surface)
+eng_image_map_surface_free(void *data EINA_UNUSED, void *surface)
{
evas_gl_common_image_free(surface);
}
static void
-eng_image_content_hint_set(void *data __UNUSED__, void *image, int hint)
+eng_image_content_hint_set(void *data EINA_UNUSED, void *image, int hint)
{
if (image) evas_gl_common_image_content_hint_set(image, hint);
}
static int
-eng_image_content_hint_get(void *data __UNUSED__, void *image)
+eng_image_content_hint_get(void *data EINA_UNUSED, void *image)
{
Evas_GL_Image *gim = image;
if (!gim) return EVAS_IMAGE_CONTENT_HINT_NONE;
@@ -1010,7 +1010,7 @@ eng_image_content_hint_get(void *data __UNUSED__, void *image)
}
static void
-eng_image_cache_flush(void *data __UNUSED__)
+eng_image_cache_flush(void *data EINA_UNUSED)
{
Render_Engine *re;
int tmp_size;
@@ -1025,7 +1025,7 @@ eng_image_cache_flush(void *data __UNUSED__)
}
static void
-eng_image_cache_set(void *data __UNUSED__, int bytes)
+eng_image_cache_set(void *data EINA_UNUSED, int bytes)
{
Render_Engine *re;
@@ -1036,7 +1036,7 @@ eng_image_cache_set(void *data __UNUSED__, int bytes)
}
static int
-eng_image_cache_get(void *data __UNUSED__)
+eng_image_cache_get(void *data EINA_UNUSED)
{
Render_Engine *re;
@@ -1046,7 +1046,7 @@ eng_image_cache_get(void *data __UNUSED__)
static void
-eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
+eng_image_stride_get(void *data EINA_UNUSED, void *image, int *stride)
{
Evas_GL_Image *im = image;
*stride = im->w * 4;
@@ -1058,7 +1058,7 @@ eng_image_stride_get(void *data __UNUSED__, void *image, int *stride)
}
static void
-eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, Evas_Text_Props *intl_props)
+eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int x, int y, int w EINA_UNUSED, int h EINA_UNUSED, int ow EINA_UNUSED, int oh EINA_UNUSED, Evas_Text_Props *intl_props)
{
Render_Engine *re;
@@ -1091,7 +1091,7 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font, int
static Eina_Bool
-eng_canvas_alpha_get(void *data __UNUSED__, void *info __UNUSED__)
+eng_canvas_alpha_get(void *data EINA_UNUSED, void *info EINA_UNUSED)
{
// FIXME: support ARGB gl targets!!!
return EINA_FALSE;
@@ -1348,7 +1348,7 @@ eng_gl_api_get(void *data)
}
static int
-eng_image_load_error_get(void *data __UNUSED__, void *image)
+eng_image_load_error_get(void *data EINA_UNUSED, void *image)
{
Evas_GL_Image *im;
diff --git a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.h b/src/modules/evas/engines/gl_cocoa/evas_engine.h
index a066d3e58..a066d3e58 100644
--- a/legacy/evas/src/modules/engines/gl_cocoa/evas_engine.h
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.h
diff --git a/legacy/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
index aa6b8950d..aa6b8950d 100644
--- a/legacy/evas/src/modules/engines/gl_cocoa/evas_gl_cocoa_main.m
+++ b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c b/src/modules/evas/engines/gl_common/evas_gl_api.c
index a40d12145..a40d12145 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.c b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
index 4f81ccf4d..4f81ccf4d 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext.h
index 058bee2f6..058bee2f6 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext.h
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext_def.h b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h
index d5d1fa3b2..d5d1fa3b2 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_api_ext_def.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_ext_def.h
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 67507b3a9..67507b3a9 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 38115fc7f..6858bc65f 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -1147,7 +1147,7 @@ vertex_array_size_check(Evas_Engine_GL_Context *gc, int pn, int n)
}
static inline Evas_GL_Shader
-evas_gl_common_shader_choice(int npoints __UNUSED__,
+evas_gl_common_shader_choice(int npoints EINA_UNUSED,
RGBA_Map_Point *p,
int r, int g, int b, int a,
Evas_GL_Shader nomul,
@@ -2364,7 +2364,7 @@ evas_gl_common_context_flush(Evas_Engine_GL_Context *gc)
}
static void
-scissor_rot(Evas_Engine_GL_Context *gc __UNUSED__,
+scissor_rot(Evas_Engine_GL_Context *gc EINA_UNUSED,
int rot, int gw, int gh, int cx, int cy, int cw, int ch)
{
switch (rot)
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 6019a6a82..3656eaf25 100755
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1465,7 +1465,7 @@ evgl_make_current(EVGL_Engine *ee, EVGL_Surface *sfc, EVGL_Context *ctx)
}
const char *
-evgl_string_query(EVGL_Engine *ee __UNUSED__, int name)
+evgl_string_query(EVGL_Engine *ee EINA_UNUSED, int name)
{
switch(name)
{
@@ -1477,7 +1477,7 @@ evgl_string_query(EVGL_Engine *ee __UNUSED__, int name)
}
void *
-evgl_proc_address_get(const char *name __UNUSED__)
+evgl_proc_address_get(const char *name EINA_UNUSED)
{
// Will eventually deprecate this function
return NULL;
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.h b/src/modules/evas/engines/gl_common/evas_gl_core.h
index c18f6fc9d..c18f6fc9d 100755
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_core.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.h
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
index 838e8f5d4..838e8f5d4 100755
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_core_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core_private.h
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_filter.c b/src/modules/evas/engines/gl_common/evas_gl_filter.c
index a9d18d824..a9d18d824 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_filter.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_filter.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c b/src/modules/evas/engines/gl_common/evas_gl_font.c
index d3b4ba443..2aaa86ac1 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_font.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_font.c
@@ -100,7 +100,7 @@ evas_gl_font_texture_free(void *tex)
}
void
-evas_gl_font_texture_draw(void *context, void *surface __UNUSED__, void *draw_context, RGBA_Font_Glyph *fg, int x, int y)
+evas_gl_font_texture_draw(void *context, void *surface EINA_UNUSED, void *draw_context, RGBA_Font_Glyph *fg, int x, int y)
{
Evas_Engine_GL_Context *gc = context;
RGBA_Draw_Context *dc = draw_context;
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index ea95ca796..404cb1380 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -661,7 +661,7 @@ evas_gl_common_image_update(Evas_Engine_GL_Context *gc, Evas_GL_Image *im)
void
evas_gl_common_image_map_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *im,
- int npoints, RGBA_Map_Point *p, int smooth, int level __UNUSED__)
+ int npoints, RGBA_Map_Point *p, int smooth, int level EINA_UNUSED)
{
RGBA_Draw_Context *dc;
int r, g, b, a;
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_line.c b/src/modules/evas/engines/gl_common/evas_gl_line.c
index c13fa255a..c13fa255a 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_line.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_line.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_polygon.c b/src/modules/evas/engines/gl_common/evas_gl_polygon.c
index 81f041e4e..81f041e4e 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_polygon.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_polygon.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_private.h b/src/modules/evas/engines/gl_common/evas_gl_private.h
index a178823fd..a178823fd 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_private.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_private.h
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_rectangle.c b/src/modules/evas/engines/gl_common/evas_gl_rectangle.c
index d95b5a28e..d95b5a28e 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_rectangle.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_rectangle.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index 477e47072..477e47072 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index b19191a89..5dd14e8e4 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -194,7 +194,7 @@ _pool_tex_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, GLenum fo
}
static int
-_pool_tex_alloc(Evas_GL_Texture_Pool *pt, int w, int h __UNUSED__, int *u, int *v, Eina_List **l_after)
+_pool_tex_alloc(Evas_GL_Texture_Pool *pt, int w, int h EINA_UNUSED, int *u, int *v, Eina_List **l_after)
{
Eina_List *l;
Evas_GL_Texture *tex, *tex2;
@@ -1039,7 +1039,7 @@ evas_gl_common_texture_alpha_new(Evas_Engine_GL_Context *gc, DATA8 *pixels,
void
evas_gl_common_texture_alpha_update(Evas_GL_Texture *tex, DATA8 *pixels,
- unsigned int w, unsigned int h, int fh __UNUSED__)
+ unsigned int w, unsigned int h, int fh EINA_UNUSED)
{
if (!tex->pt) return;
glBindTexture(GL_TEXTURE_2D, tex->pt->texture);
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/.gitignore b/src/modules/evas/engines/gl_common/shader/.gitignore
index a01ee289f..a01ee289f 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/.gitignore
+++ b/src/modules/evas/engines/gl_common/shader/.gitignore
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/compile.sh b/src/modules/evas/engines/gl_common/shader/compile.sh
index a96b58c9e..a96b58c9e 100755
--- a/legacy/evas/src/modules/engines/gl_common/shader/compile.sh
+++ b/src/modules/evas/engines/gl_common/shader/compile.sh
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h b/src/modules/evas/engines/gl_common/shader/filter_blur.h
index 7c3a3697c..7c3a3697c 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.shd b/src/modules/evas/engines/gl_common/shader/filter_blur.shd
index 5f13a4740..5f13a4740 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra.h
index 0862e4f65..0862e4f65 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra.shd
index a9134df1d..a9134df1d 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h
index 0862e4f65..0862e4f65 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd
index a9134df1d..a9134df1d 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_bgra_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_bgra_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_blur_nomul.h
index 0862e4f65..0862e4f65 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_nomul.shd
index a9134df1d..a9134df1d 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h b/src/modules/evas/engines/gl_common/shader/filter_blur_vert.h
index d38f4127f..d38f4127f 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.shd b/src/modules/evas/engines/gl_common/shader/filter_blur_vert.shd
index 56ddc404f..56ddc404f 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_blur_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_blur_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale.h
index 850538a52..850538a52 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale.shd
index 78ecf0883..78ecf0883 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h
index 3caef3506..3caef3506 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd
index 5dca38101..5dca38101 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
index 4cb36a873..4cb36a873 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd
index a077eea93..a077eea93 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale_bgra_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h
index f501a02bc..f501a02bc 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd
index b5b8ec6b9..b5b8ec6b9 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_greyscale_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_greyscale_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h b/src/modules/evas/engines/gl_common/shader/filter_invert.h
index 46373e0da..46373e0da 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.shd b/src/modules/evas/engines/gl_common/shader/filter_invert.shd
index a75b05802..a75b05802 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra.h
index 3e3011d4e..3e3011d4e 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra.shd
index 8d7df2d3d..8d7df2d3d 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h
index b9f1e2575..b9f1e2575 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd
index 682acb2d0..682acb2d0 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_bgra_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert_bgra_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_invert_nomul.h
index 46373e0da..46373e0da 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_invert_nomul.shd
index a75b05802..a75b05802 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_invert_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_invert_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h b/src/modules/evas/engines/gl_common/shader/filter_sepia.h
index 50fbf12c6..50fbf12c6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia.shd
index 027ecfb39..027ecfb39 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.h
index 41e4283d1..41e4283d1 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd
index caed3780a..caed3780a 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h
index 0c4fe1b2e..0c4fe1b2e 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd
index 9c6c1d4bf..9c6c1d4bf 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_bgra_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia_bgra_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h b/src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.h
index 23af9ecb9..23af9ecb9 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.h
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd b/src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd
index f9871bd8f..f9871bd8f 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/filter_sepia_nomul.shd
+++ b/src/modules/evas/engines/gl_common/shader/filter_sepia_nomul.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_frag.h b/src/modules/evas/engines/gl_common/shader/font_frag.h
index f27dcdc10..f27dcdc10 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/font_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/font_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_frag.shd b/src/modules/evas/engines/gl_common/shader/font_frag.shd
index a8eb9b74b..a8eb9b74b 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/font_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/font_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_vert.h b/src/modules/evas/engines/gl_common/shader/font_vert.h
index 8921d9dfe..8921d9dfe 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/font_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/font_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/font_vert.shd b/src/modules/evas/engines/gl_common/shader/font_vert.shd
index 606c297e6..606c297e6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/font_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/font_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h b/src/modules/evas/engines/gl_common/shader/img_bgra_frag.h
index 1ced5e0ab..1ced5e0ab 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_frag.shd
index 2bc8d7954..2bc8d7954 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h
index 459611f4a..459611f4a 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd
index 877df62ba..877df62ba 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h
index 13d5edd21..13d5edd21 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd
index 74f320717..74f320717 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_nomul_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h b/src/modules/evas/engines/gl_common/shader/img_bgra_vert.h
index 8921d9dfe..8921d9dfe 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd b/src/modules/evas/engines/gl_common/shader/img_bgra_vert.shd
index 606c297e6..606c297e6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_bgra_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_bgra_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_frag.h b/src/modules/evas/engines/gl_common/shader/img_frag.h
index 0a9550201..0a9550201 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/img_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_frag.shd b/src/modules/evas/engines/gl_common/shader/img_frag.shd
index 9faa414e3..9faa414e3 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.h b/src/modules/evas/engines/gl_common/shader/img_mask_frag.h
index 1b2812828..1b2812828 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/img_mask_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.shd b/src/modules/evas/engines/gl_common/shader/img_mask_frag.shd
index 0b7307ef4..0b7307ef4 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_mask_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.h b/src/modules/evas/engines/gl_common/shader/img_mask_vert.h
index 7508c983e..7508c983e 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/img_mask_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.shd b/src/modules/evas/engines/gl_common/shader/img_mask_vert.shd
index 14148709b..14148709b 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_mask_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_mask_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/img_nomul_frag.h
index 0343b340c..0343b340c 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/img_nomul_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/img_nomul_frag.shd
index 222d635c0..222d635c0 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_nomul_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/img_nomul_vert.h
index 13d5edd21..13d5edd21 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/img_nomul_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/img_nomul_vert.shd
index 74f320717..74f320717 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_nomul_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_vert.h b/src/modules/evas/engines/gl_common/shader/img_vert.h
index 8921d9dfe..8921d9dfe 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/img_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/img_vert.shd b/src/modules/evas/engines/gl_common/shader/img_vert.shd
index 606c297e6..606c297e6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/img_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/img_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/make-c-str.sh b/src/modules/evas/engines/gl_common/shader/make-c-str.sh
index fe7e80a9c..fe7e80a9c 100755
--- a/legacy/evas/src/modules/engines/gl_common/shader/make-c-str.sh
+++ b/src/modules/evas/engines/gl_common/shader/make-c-str.sh
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h b/src/modules/evas/engines/gl_common/shader/nv12_frag.h
index fec4b238c..fec4b238c 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/nv12_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.shd b/src/modules/evas/engines/gl_common/shader/nv12_frag.shd
index 34748fc5b..34748fc5b 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/nv12_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.h
index df52d19f6..df52d19f6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd
index 6910933dc..6910933dc 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/nv12_nomul_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.h
index 8ad060f74..8ad060f74 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd
index ddd0d6e4a..ddd0d6e4a 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/nv12_nomul_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h b/src/modules/evas/engines/gl_common/shader/nv12_vert.h
index 669f181f7..669f181f7 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/nv12_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd b/src/modules/evas/engines/gl_common/shader/nv12_vert.shd
index ee9238c92..ee9238c92 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/nv12_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/nv12_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_frag.h b/src/modules/evas/engines/gl_common/shader/rect_frag.h
index 4a102a4d6..4a102a4d6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/rect_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/rect_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_frag.shd b/src/modules/evas/engines/gl_common/shader/rect_frag.shd
index 02251eecc..02251eecc 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/rect_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/rect_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_vert.h b/src/modules/evas/engines/gl_common/shader/rect_vert.h
index 51d41aa6e..51d41aa6e 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/rect_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/rect_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/rect_vert.shd b/src/modules/evas/engines/gl_common/shader/rect_vert.shd
index 63fea5d53..63fea5d53 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/rect_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/rect_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_frag.h b/src/modules/evas/engines/gl_common/shader/tex_frag.h
index 1ced5e0ab..1ced5e0ab 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/tex_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_frag.shd b/src/modules/evas/engines/gl_common/shader/tex_frag.shd
index 2bc8d7954..2bc8d7954 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/tex_nomul_frag.h
index 459611f4a..459611f4a 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/tex_nomul_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/tex_nomul_frag.shd
index 877df62ba..877df62ba 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_nomul_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/tex_nomul_vert.h
index 13d5edd21..13d5edd21 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/tex_nomul_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_nomul_vert.shd
index 74f320717..74f320717 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_nomul_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_vert.h b/src/modules/evas/engines/gl_common/shader/tex_vert.h
index 8921d9dfe..8921d9dfe 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/tex_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/tex_vert.shd b/src/modules/evas/engines/gl_common/shader/tex_vert.shd
index 606c297e6..606c297e6 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/tex_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/tex_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h b/src/modules/evas/engines/gl_common/shader/yuv_frag.h
index 87f409572..87f409572 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/yuv_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd b/src/modules/evas/engines/gl_common/shader/yuv_frag.shd
index 367fb5534..367fb5534 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/yuv_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.h
index 0df4b9793..0df4b9793 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd
index ce2462225..ce2462225 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/yuv_nomul_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h b/src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.h
index c3f585f47..c3f585f47 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd b/src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd
index a83d5052d..a83d5052d 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_nomul_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/yuv_nomul_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h b/src/modules/evas/engines/gl_common/shader/yuv_vert.h
index 6ccf06d64..6ccf06d64 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.h
+++ b/src/modules/evas/engines/gl_common/shader/yuv_vert.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd b/src/modules/evas/engines/gl_common/shader/yuv_vert.shd
index 0ea0b2fef..0ea0b2fef 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuv_vert.shd
+++ b/src/modules/evas/engines/gl_common/shader/yuv_vert.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h b/src/modules/evas/engines/gl_common/shader/yuy2_frag.h
index abe4b0311..abe4b0311 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/yuy2_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd b/src/modules/evas/engines/gl_common/shader/yuy2_frag.shd
index 98dd91bbb..98dd91bbb 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader/yuy2_frag.shd
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h
index 618fa5004..618fa5004 100644
--- a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.h
+++ b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.h
diff --git a/legacy/evas/src/modules/engines/gl_common/shader/yuy2_nomul_frag.shd b/src/modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd
index fd82e2a71..fd82e2a71 100644
--- a/