summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 7b4bc356c5..ac1e58d60a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -63,6 +63,52 @@ Lionel Orry <lionel.orry@gmail.com>
63Jérôme Pinot <ngc891@gmail.com> 63Jérôme Pinot <ngc891@gmail.com>
64Leandro Santiago <leandrosansilva@gmail.com> 64Leandro Santiago <leandrosansilva@gmail.com>
65 65
66Evas
67----
68
69Carsten Haitzler <raster@rasterman.com>
70Till Adam <till@adam-lilienthal.de>
71Steve Ireland <sireland@pobox.com>
72Brett Nash <nash@fluffyspider.com.au>
73Tilman Sauerbeck <tilman@code-monkey.de>
74Corey Donohoe <atmos@atmos.org>
75Yuri Hudobin <glassy_ape@users.sourceforge.net>
76Nathan Ingersoll <ningerso@d.umn.edu>
77Willem Monsuwe <willem@stack.nl>
78Jose O Gonzalez <jose_ogp@juno.com>
79Bernhard Nemec <Bernhard.Nemec@viasyshc.com>
80Jorge Luis Zapata Muga <jorgeluis.zapata@gmail.com>
81Cedric Bail <cedric.bail@free.fr>
82Gustavo Sverzut Barbieri <barbieri@gmail.com>
83Vincent Torri <vtorri at univ-evry dot fr>
84Tim Horton <hortont424@gmail.com>
85Tom Hacohen <tom@stosb.com>
86Mathieu Taillefumier <mathieu.taillefumier@free.fr>
87Iván Briano <ivan@profusion.mobi>
88Gustavo Lima Chaves <glima@profusion.mobi>
89Samsung Electronics
90Samsung SAIT
91Sung W. Park <sungwoo@gmail.com>
92Jiyoun Park <jy0703.park@samsung.com>
93Myoungwoon Roy Kim(roy_kim) <myoungwoon.kim@samsung.com> <myoungwoon@gmail.com>
94Thierry el Borgi <thierry@substantiel.fr>
95Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com>
96ChunEon Park <hermet@hermet.pe.kr>
97Christopher 'devilhorns' Michael <cpmichael1@comcast.net>
98Seungsoo Woo <om101.woo@samsung.com>
99Youness Alaoui <kakaroto@kakaroto.homelinux.net>
100Jim Kukunas <james.t.kukunas@linux.intel.com>
101Nicolas Aguirre <aguirre.nicolas@gmail.com>
102Rafal Krypa <r.krypa@samsung.com>
103Hyoyoung Chang <hyoyoung@gmail.com>
104Jérôme Pinot <ngc891@gmail.com>
105Rafael Antognolli <antognolli@profusion.mobi>
106Daniel Zaoui <daniel.zaoui@samsung.com>
107Christophe Sadoine <chris@indefini.org>
108Igor Murzov <e-mail@date.by>
109Sohyun Kim <anna1014.kim@samsung.com>
110Boris Faure <billiob@gmail.com>
111
66Embryo 112Embryo
67------ 113------
68 114
diff --git a/COPYING b/COPYING
index 40367789be..4cbd1f8642 100644
--- a/COPYING
+++ b/COPYING
@@ -5,4 +5,5 @@ evil: licenses/COPYING.BSD
5eet: licenses/COPYING.BSD 5eet: licenses/COPYING.BSD
6eina: licenses/COPYING.LGPL 6eina: licenses/COPYING.LGPL
7eo: licenses/COPYING.BSD 7eo: licenses/COPYING.BSD
8evas: licenses/COPYING.BSD
8embryo: licenses/COPYING.BSD 9embryo: licenses/COPYING.BSD
diff --git a/Makefile.am b/Makefile.am
index 6cca8553b9..45dd848e97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ MAINTAINERCLEANFILES = \
6Makefile.in \ 6Makefile.in \
7aclocal.m4 \ 7aclocal.m4 \
8compile \ 8compile \
9config.cache-env \
9config.guess \ 10config.guess \
10config.h.in \ 11config.h.in \
11config.h.in~ \ 12config.h.in~ \
@@ -33,6 +34,7 @@ m4/evil_windows.m4 \
33m4/eina_check.m4 34m4/eina_check.m4
34 35
35EXTRA_DIST += \ 36EXTRA_DIST += \
37autogen.sh \
36licenses/COPYING.LGPL \ 38licenses/COPYING.LGPL \
37licenses/COPYING.GPL \ 39licenses/COPYING.GPL \
38licenses/COPYING.BSD \ 40licenses/COPYING.BSD \
@@ -50,6 +52,19 @@ pc/evil.pc \
50pc/eina.pc \ 52pc/eina.pc \
51pc/eet.pc \ 53pc/eet.pc \
52pc/eo.pc \ 54pc/eo.pc \
55pc/evas.pc \
56pc/evas-directfb.pc \
57pc/evas-fb.pc \
58pc/evas-opengl-x11.pc \
59pc/evas-opengl-sdl.pc \
60pc/evas-software-buffer.pc \
61pc/evas-software-x11.pc \
62pc/evas-software-gdi.pc \
63pc/evas-software-ddraw.pc \
64pc/evas-direct3d.pc \
65pc/evas-psl1ght.pc \
66pc/evas-wayland-shm.pc \
67pc/evas-wayland-egl.pc \
53pc/embryo.pc 68pc/embryo.pc
54 69
55pkgconfigdir = $(libdir)/pkgconfig 70pkgconfigdir = $(libdir)/pkgconfig
@@ -63,8 +78,61 @@ pkgconfig_DATA += \
63pc/eina.pc \ 78pc/eina.pc \
64pc/eo.pc \ 79pc/eo.pc \
65pc/eet.pc \ 80pc/eet.pc \
81pc/evas.pc \
66pc/embryo.pc 82pc/embryo.pc
67 83
84if BUILD_ENGINE_SOFTWARE_X11
85pkgconfig_DATA += pc/evas-software-x11.pc
86endif
87
88if BUILD_ENGINE_DIRECTFB
89pkgconfig_DATA += pc/evas-directfb.pc
90endif
91
92if BUILD_ENGINE_FB
93pkgconfig_DATA += pc/evas-fb.pc
94endif
95
96if BUILD_ENGINE_BUFFER
97pkgconfig_DATA += pc/evas-software-buffer.pc
98endif
99
100if BUILD_ENGINE_GL_X11
101pkgconfig_DATA += pc/evas-opengl-x11.pc
102endif
103
104if BUILD_ENGINE_GL_SDL
105pkgconfig_DATA += pc/evas-opengl-sdl.pc
106endif
107
108if BUILD_ENGINE_GL_COCOA
109pkgconfig_DATA += pc/evas-opengl-cocoa.pc
110endif
111
112if BUILD_ENGINE_SOFTWARE_GDI
113pkgconfig_DATA += pc/evas-software-gdi.pc
114endif
115
116if BUILD_ENGINE_SOFTWARE_DDRAW
117pkgconfig_DATA += pc/evas-software-ddraw.pc
118endif
119
120if BUILD_ENGINE_DIRECT3D
121pkgconfig_DATA += pc/evas-direct3d.pc
122endif
123
124if BUILD_ENGINE_PSL1GHT
125pkgconfig_DATA += pc/evas-psl1ght.pc
126endif
127
128if BUILD_ENGINE_WAYLAND_SHM
129pkgconfig_DATA += pc/evas-wayland-shm.pc
130endif
131
132if BUILD_ENGINE_WAYLAND_EGL
133pkgconfig_DATA += pc/evas-wayland-egl.pc
134endif
135
68 136
69.PHONY: doc benchmark examples install-examples 137.PHONY: doc benchmark examples install-examples
70 138
diff --git a/configure.ac b/configure.ac
index 5e4283bb06..5052cd7f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ requirements_libs_evil=""
55requirements_libs_eina="" 55requirements_libs_eina=""
56requirements_libs_eo="" 56requirements_libs_eo=""
57requirements_libs_eet="" 57requirements_libs_eet=""
58#requirements_libs_evas="" 58requirements_libs_evas=""
59#requirements_libs_ecore="" 59#requirements_libs_ecore=""
60requirements_libs_embryo="" 60requirements_libs_embryo=""
61#requirements_libs_eio="" 61#requirements_libs_eio=""
@@ -71,7 +71,7 @@ requirements_libs_deps_evil=""
71requirements_libs_deps_eina="" 71requirements_libs_deps_eina=""
72requirements_libs_deps_eo="" 72requirements_libs_deps_eo=""
73requirements_libs_deps_eet="" 73requirements_libs_deps_eet=""
74#requirements_libs_deps_evas="" 74requirements_libs_deps_evas=""
75#requirements_libs_deps_ecore="" 75#requirements_libs_deps_ecore=""
76requirements_libs_deps_embryo="" 76requirements_libs_deps_embryo=""
77#requirements_libs_deps_eio="" 77#requirements_libs_deps_eio=""
@@ -86,7 +86,7 @@ requirements_libs_deps_embryo=""
86requirements_pc_eina="" 86requirements_pc_eina=""
87requirements_pc_eo="" 87requirements_pc_eo=""
88requirements_pc_eet="" 88requirements_pc_eet=""
89#requirements_pc_evas="" 89requirements_pc_evas=""
90#requirements_pc_ecore="" 90#requirements_pc_ecore=""
91requirements_pc_embryo="" 91requirements_pc_embryo=""
92#requirements_pc_eio="" 92#requirements_pc_eio=""
@@ -101,7 +101,7 @@ requirements_pc_embryo=""
101requirements_pc_deps_eina="" 101requirements_pc_deps_eina=""
102requirements_pc_deps_eo="" 102requirements_pc_deps_eo=""
103requirements_pc_deps_eet="" 103requirements_pc_deps_eet=""
104#requirements_pc_deps_evas="" 104requirements_pc_deps_evas=""
105#requirements_pc_deps_ecore="" 105#requirements_pc_deps_ecore=""
106requirements_pc_deps_embryo="" 106requirements_pc_deps_embryo=""
107#requirements_pc_deps_eio="" 107#requirements_pc_deps_eio=""
@@ -117,7 +117,7 @@ AC_SUBST([requirements_libs_evil])
117AC_SUBST([requirements_libs_eina]) 117AC_SUBST([requirements_libs_eina])
118AC_SUBST([requirements_libs_eo]) 118AC_SUBST([requirements_libs_eo])
119AC_SUBST([requirements_libs_eet]) 119AC_SUBST([requirements_libs_eet])
120#AC_SUBST([requirements_libs_evas]) 120AC_SUBST([requirements_libs_evas])
121#AC_SUBST([requirements_libs_ecore]) 121#AC_SUBST([requirements_libs_ecore])
122AC_SUBST([requirements_libs_embryo]) 122AC_SUBST([requirements_libs_embryo])
123#AC_SUBST([requirements_libs_eio]) 123#AC_SUBST([requirements_libs_eio])
@@ -132,7 +132,7 @@ AC_SUBST([requirements_libs_embryo])
132AC_SUBST([requirements_pc_eina]) 132AC_SUBST([requirements_pc_eina])
133AC_SUBST([requirements_pc_eo]) 133AC_SUBST([requirements_pc_eo])
134AC_SUBST([requirements_pc_eet]) 134AC_SUBST([requirements_pc_eet])
135#AC_SUBST([requirements_pc_evas]) 135AC_SUBST([requirements_pc_evas])
136#AC_SUBST([requirements_pc_ecore]) 136#AC_SUBST([requirements_pc_ecore])
137AC_SUBST([requirements_pc_embryo]) 137AC_SUBST([requirements_pc_embryo])
138#AC_SUBST([requirements_pc_eio]) 138#AC_SUBST([requirements_pc_eio])
@@ -179,6 +179,7 @@ case "$host_os" in
179 ;; 179 ;;
180esac 180esac
181 181
182AC_SUBST([MODULE_ARCH])
182AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"]) 183AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
183AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects]) 184AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
184 185
@@ -225,6 +226,32 @@ AC_SUBST([release_info])
225 226
226### compilers 227### compilers
227 228
229# rw_PROG_OBJC_WORKS
230# Check whether the Objective C compiler works.
231AC_DEFUN([rw_PROG_OBJC_WORKS],
232[m4_ifdef([AC_PROG_OBJC], [AC_REQUIRE([AC_PROG_OBJC])dnl
233AC_CACHE_CHECK([whether the Objective C compiler works],
234 [rw_cv_prog_objc_works],
235 [AC_LANG_PUSH([Objective C])
236 AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
237 [rw_cv_prog_objc_works=yes],
238 [rw_cv_prog_objc_works=no])
239 AC_LANG_POP([Objective C])])], [rw_cv_prog_objc_works=no])
240])
241
242m4_ifdef([AC_PROG_OBJC],
243 [
244 AC_PROG_OBJC
245 _AM_DEPENDENCIES(OBJC)
246 ],
247 [
248 dnl#AC_CHECK_TOOL([OBJC], [gcc])
249 dnl#AC_SUBST([OBJC])
250 dnl#AC_SUBST([OBJCFLAGS])
251 ])
252
253rw_PROG_OBJC_WORKS
254
228AM_PROG_AS 255AM_PROG_AS
229AC_PROG_CXX 256AC_PROG_CXX
230AC_LANG(C) 257AC_LANG(C)
@@ -263,6 +290,8 @@ siginfo.h \
263stdint.h \ 290stdint.h \
264strings.h \ 291strings.h \
265sys/types.h \ 292sys/types.h \
293sys/param.h \
294sys/mman.h \
266unistd.h \ 295unistd.h \
267]) 296])
268 297
@@ -312,6 +341,11 @@ case "${build_profile}" in
312 ;; 341 ;;
313esac 342esac
314 343
344EFL_ATTRIBUTE_VECTOR
345EFL_ATTRIBUTE_ALWAYS_INLINE
346
347EFL_LIBS=
348AC_SUBST([EFL_LIBS])
315 349
316#### Checks for linker characteristics 350#### Checks for linker characteristics
317 351
@@ -817,6 +851,910 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
817#### End of Eo 851#### End of Eo
818 852
819 853
854#### Evas
855
856AC_MSG_NOTICE([Evas checks])
857
858### Additional options to configure
859
860# when used, that option makes configure script fails when
861# a requirement is selected, but not met.
862use_strict="no"
863AC_ARG_ENABLE([strict],
864 [AC_HELP_STRING([--enable-strict], [enable strict checking mode. @<:@default==disabled@:>@])],
865 [use_strict="yes"],
866 [use_strict="no"])
867
868# Simple X11 build/link
869AC_ARG_ENABLE([simple-x11],
870 [AC_HELP_STRING([--enable-simple-x11],
871 [enable simple x11 linking. @<:@default=disabled@:>@])],
872 [
873 if test "x${enableval}" = "xyes" ; then
874 want_evas_simple_x11="yes"
875 else
876 want_evas_simple_x11="no"
877 fi
878 ],
879 [want_evas_simple_x11="no"])
880
881# Fontconfig
882AC_ARG_ENABLE([fontconfig],
883 [AC_HELP_STRING([--disable-fontconfig],
884 [disable fontconfig for finding fonts. @<:@default=enabled@:>@])],
885 [
886 if test "x${enableval}" = "xyes" ; then
887 want_fontconfig="yes"
888 else
889 want_fontconfig="no"
890 fi
891 ],
892 [want_fontconfig="yes"])
893
894# Fribidi
895AC_ARG_ENABLE([fribidi],
896 [AC_HELP_STRING([--disable-fribidi],
897 [disable bidirectional text support. @<:@default=enabled@:>@])],
898 [
899 if test "x${enableval}" = "xyes" ; then
900 want_fribidi="yes"
901 else
902 want_fribidi="no"
903 fi
904 ],
905 [want_fribidi="yes"])
906
907# Harfbuzz
908AC_ARG_ENABLE([harfbuzz],
909 [AC_HELP_STRING([--disable-harfbuzz],
910 [disable complex text shaping and layouting support. @<:@default=auto@:>@])],
911 [
912 if test "x${enableval}" = "xyes" ; then
913 want_harfbuzz="yes"
914 else
915 want_harfbuzz="no"
916 fi
917 ],
918 [want_harfbuzz="auto"])
919
920# Pixman
921AC_ARG_ENABLE([pixman],
922 [AC_HELP_STRING([--enable-pixman],
923 [enable pixman for software rendering. @<:@default=disabled@:>@])],
924 [
925 if test "x${enableval}" = "xyes" ; then
926 want_pixman="yes"
927 else
928 want_pixman="no"
929 fi
930 ],
931 [want_pixman="yes"])
932
933AC_ARG_ENABLE([pixman-font],
934 [AC_HELP_STRING([--enable-pixman-font],
935 [Allow pixman to render fonts. @<:@default=disabled@:>@])],
936 [
937 if test "x${enableval}" = "xyes" ; then
938 have_pixman_font="yes"
939 else
940 have_pixman_font="no"
941 fi
942 ],
943 [have_pixman_font="no"])
944
945AC_ARG_ENABLE([pixman-rect],
946 [AC_HELP_STRING([--enable-pixman-rect],
947 [Allow pixman to render rects. @<:@default=disabled@:>@])],
948 [
949 if test "x${enableval}" = "xyes" ; then
950 have_pixman_rect="yes"
951 else
952 have_pixman_rect="no"
953 fi
954 ],
955 [have_pixman_rect="no"])
956
957AC_ARG_ENABLE([pixman-line],
958 [AC_HELP_STRING([--enable-pixman-line],
959 [Allow pixman to render lines. @<:@default=disabled@:>@])],
960 [
961 if test "x${enableval}" = "xyes" ; then
962 have_pixman_line="yes"
963 else
964 have_pixman_line="no"
965 fi
966 ],
967 [have_pixman_line="no"])
968
969AC_ARG_ENABLE(pixman-poly,
970 AC_HELP_STRING([--enable-pixman-poly],
971 [Allow pixman to render polys. @<:@default=disabled@:>@]),
972 [
973 if test "x${enableval}" = "xyes" ; then
974 have_pixman_poly="yes"
975 else
976 have_pixman_poly="no"
977 fi
978 ],
979 [have_pixman_poly="no"])
980
981AC_ARG_ENABLE([pixman-image],
982 [AC_HELP_STRING([--enable-pixman-image],
983 [Allow pixman to render images. @<:@default=disabled@:>@])],
984 [
985 if test "x${enableval}" = "xyes" ; then
986 have_pixman_image="yes"
987 else
988 have_pixman_image="no"
989 fi
990 ],
991 [have_pixman_image="no"])
992
993AC_ARG_ENABLE([pixman-image-scale-sample],
994 [AC_HELP_STRING([--enable-pixman-image-scale-sample],
995 [Allow pixman to render sampled scaled images. @<:@default=disabled@:>@])],
996 [
997 if test "x${enableval}" = "xyes" ; then
998 have_pixman_image_scale_sample="yes"
999 else
1000 have_pixman_image_scale_sample="no"
1001 fi
1002 ],
1003 [have_pixman_image_scale_sample="no"])
1004
1005# Tile rotate
1006AC_ARG_ENABLE([tile-rotate],
1007 [AC_HELP_STRING([--enable-tile-rotate],
1008 [Enable tiled rotate algorithm. @<:@default=disabled@:>@])],
1009 [
1010 if test "x${enableval}" = "xyes" ; then
1011 have_tile_rotate="yes"
1012 else
1013 have_tile_rotate="no"
1014 fi
1015 ],
1016 [have_tile_rotate="no"])
1017
1018# SSE3
1019AC_ARG_ENABLE([cpu-sse3],
1020 [AC_HELP_STRING([--enable-cpu-sse3],
1021 [enable SSE3 code. @<:@default=enabled@:>@])],
1022 [
1023 if test "x${enableval}" = "xyes" ; then
1024 want_sse3="yes"
1025 else
1026 want_sse3="no"
1027 fi
1028 ],
1029 [want_sse3="yes"])
1030
1031# Engines
1032
1033AC_ARG_ENABLE([software-xcb],
1034 AC_HELP_STRING([--enable-software-xcb], [enable Software XCB Engine. @<:@default=disabled@:>@]),
1035 [
1036 if test "x$enableval" = "xyes" ; then
1037 want_xcb="yes"
1038 else
1039 want_xcb="no"
1040 fi
1041 ],
1042 [want_xcb="no"])
1043
1044AC_ARG_ENABLE([gl-xcb],
1045 AC_HELP_STRING([--enable-gl-xcb], [enable OpenGL XCB Engine. @<:@default=disabled@:>@]),
1046 [
1047 if test "x$enableval" = "xyes" ; then
1048 want_gl_xcb="yes"
1049 else
1050 want_gl_xcb="no"
1051 fi
1052 ],
1053 [want_gl_xcb="no"])
1054
1055AC_ARG_ENABLE([static-software-generic],
1056 [AC_HELP_STRING([--enable-static-software-generic], [Build software generic engine as part of libevas. @<:@default=disabled@:>@])],
1057 [
1058 if test "x$enableval" = "xyes" ; then
1059 have_static_software_generic="yes"
1060 else
1061 have_static_software_generic="no"
1062 fi
1063 ],
1064 [have_static_software_generic="no"])
1065
1066AC_ARG_ENABLE([gl-flavor-gles],
1067 [AC_HELP_STRING([--enable-gl-flavor-gles], [enable gles flavor of gl instead of standard. @<:@default=disabled@:>@])],
1068 [
1069 if test "x$enableval" = "xyes" ; then
1070 gl_flavor_gles="yes"
1071 else
1072 gl_flavor_gles="no"
1073 fi
1074 ],
1075 [gl_flavor_gles="no"])
1076
1077AC_ARG_ENABLE([sdl-primitive],
1078 [AC_HELP_STRING([--enable-sdl-primitive], [enable SDL primitives. @<:@default=disabled@:>@])],
1079 [
1080 if test "x$enableval" = "xyes" ; then
1081 sdl_primitive="yes"
1082 else
1083 sdl_primitive="no"
1084 fi
1085 ],
1086 [sdl_primitive="no"])
1087
1088# Loaders
1089
1090AC_ARG_ENABLE([image-loader-gif],
1091 [AC_HELP_STRING([--enable-image-loader-gif], [enable Gif image loader. @<:@default=enabled@:>@])],
1092 [
1093 if test "x${enableval}" = "xyes" ; then
1094 want_evas_image_loader_gif="yes"
1095 else
1096 if test "x${enableval}" = "xstatic" ; then
1097 want_evas_image_loader_gif="static"
1098 else
1099 want_evas_image_loader_gif="no"
1100 fi
1101 fi
1102 ],
1103 [want_evas_image_loader_gif="yes"])
1104
1105AC_ARG_ENABLE([image-loader-svg],
1106 [AC_HELP_STRING([--enable-image-loader-svg], [enable SVG image loader. @<:@default=enabled@:>@])],
1107 [
1108 if test "x${enableval}" = "xyes" ; then
1109 want_evas_image_loader_svg="yes"
1110 else
1111 if test "x${enableval}" = "xstatic" ; then
1112 want_evas_image_loader_svg="static"
1113 else
1114 want_evas_image_loader_svg="no"
1115 fi
1116 fi
1117 ],
1118 [want_evas_image_loader_svg="yes"])
1119
1120AC_ARG_ENABLE([image-loader-tiff],
1121 [AC_HELP_STRING([--enable-image-loader-tiff], [enable Tiff image loader. @<:@default=enabled@:>@])],
1122 [
1123 if test "x${enableval}" = "xyes" ; then
1124 want_evas_image_loader_tiff="yes"
1125 else
1126 if test "x${enableval}" = "xstatic" ; then
1127 want_evas_image_loader_tiff="static"
1128 else
1129 want_evas_image_loader_tiff="no"
1130 fi
1131 fi
1132 ],
1133 [want_evas_image_loader_tiff="yes"])
1134
1135AC_ARG_ENABLE([image-loader-webp],
1136 [AC_HELP_STRING([--enable-image-loader-webp], [enable WEBP image loader. @<:@default=enabled@:>@])],
1137 [
1138 if test "x${enableval}" = "xyes" ; then
1139 want_evas_image_loader_webp="yes"
1140 else
1141 if test "x${enableval}" = "xstatic" ; then
1142 want_evas_image_loader_webp="static"
1143 else
1144 want_evas_image_loader_webp="no"
1145 fi
1146 fi
1147 ],
1148 [want_evas_image_loader_webp="yes"])
1149
1150### Default values
1151
1152want_evas_cserve2="yes"
1153
1154want_evas_engine_buffer="yes"
1155want_evas_engine_software_xlib="no"
1156want_evas_engine_software_xcb="no"
1157want_evas_engine_software_gdi="no"
1158want_evas_engine_software_ddraw="no"
1159want_evas_engine_gl_xlib="no"
1160want_evas_engine_gl_xcb="no"
1161want_evas_engine_gl_sdl="no"
1162want_evas_engine_gl_cocoa="no"
1163want_evas_engine_direct3d="no"
1164want_evas_engine_fb="no"
1165want_evas_engine_directfb="no"
1166want_evas_engine_psl1ght="no"
1167want_evas_engine_wayland_shm="no"
1168want_evas_engine_wayland_egl="no"
1169
1170want_evas_image_loader_bmp="static"
1171want_evas_image_loader_eet="static"
1172want_evas_image_loader_generic="static"
1173#want_evas_image_loader_gif="yes"
1174want_evas_image_loader_ico="static"
1175want_evas_image_loader_jpeg="static"
1176want_evas_image_loader_pmaps="static"
1177want_evas_image_loader_png="static"
1178want_evas_image_loader_psd="static"
1179#want_evas_image_loader_svg="yes"
1180want_evas_image_loader_tga="static"
1181#want_evas_image_loader_tiff="yes"
1182want_evas_image_loader_wbmp="static"
1183#want_evas_image_loader_webp="yes"
1184want_evas_image_loader_xpm="static"
1185
1186case "$host_os" in
1187 mingw32ce*)
1188 want_fontconfig="no"
1189 want_evas_image_loader_gif="no"
1190 want_evas_image_loader_svg="no"
1191 want_evas_image_loader_tiff="no"
1192 want_evas_image_loader_webp="no"
1193 ;;
1194 mingw*)
1195 want_evas_engine_software_gdi="yes"
1196 want_evas_engine_software_ddraw="yes"
1197 want_evas_engine_direct3d="yes"
1198 ;;
1199 darwin*)
1200 want_evas_engine_software_xlib="auto"
1201 want_evas_engine_gl_cocoa="auto"
1202 ;;
1203 *)
1204 want_evas_engine_software_xlib="auto"
1205 want_evas_engine_gl_xlib="auto"
1206 want_evas_engine_software_xcb="no"
1207 want_evas_engine_gl_xcb="no"
1208 want_evas_engine_fb="auto"
1209 want_evas_engine_wayland_shm="auto"
1210 want_evas_engine_wayland_egl="auto"
1211 ;;
1212esac
1213
1214EFL_CHECK_FUNC([DLSYM], [dlsym])
1215requirements_libs_deps_evas="${requirements_libs_deps_evas} ${DLSYM_LIBS}"
1216
1217if test "x${efl_func_dlsym}" = "xno" ; then
1218 want_evas_engine_gl_xlib="no"
1219 want_evas_engine_gl_xcb="no"
1220 want_evas_engine_gl_sdl="no"
1221fi
1222
1223case "$host_vendor" in
1224 ps3*)
1225 want_evas_engine_psl1ght="static"
1226 ;;
1227esac
1228
1229### Checks for programs
1230
1231### Checks for libraries
1232
1233## Compatibility layers
1234
1235# Evil library for compilation on Windows
1236
1237case "$host_os" in
1238 mingw*)
1239 requirements_pc_evas="${requirements_pc_evas} evil >= ${PACKAGE_VERSION}"
1240 ;;
1241esac
1242
1243# Eina, Eo and Eet libraries
1244
1245requirements_pc_evas="eo >= ${PACKAGE_VERSION} eet >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION} ${requirements_pc_evas}"
1246
1247# Freetype
1248PKG_CHECK_EXISTS([freetype2 >= 9.3.0],
1249 [requirements_pc_evas="freetype2 >= 9.3.0 ${requirements_pc_evas}"])
1250
1251requirements_pc_deps_evas="freetype2 ${requirements_pc_deps_evas}"
1252
1253## optional dependencies
1254
1255# FontConfig
1256have_fontconfig="no"
1257if test "x${want_fontconfig}" = "xyes"; then
1258 PKG_CHECK_EXISTS([fontconfig >= 2.5.0],
1259 [
1260 have_fontconfig="yes"
1261 AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig searching capabilities])
1262 requirements_pc_evas="fontconfig ${requirements_pc_evas}"
1263 requirements_pc_deps_evas="fontconfig ${requirements_pc_deps_evas}"
1264 ])
1265fi
1266
1267# fribidi support
1268have_fribidi="no"
1269if test "x${want_fribidi}" = "xyes"; then
1270 PKG_CHECK_EXISTS([fribidi >= 0.19.2],
1271 [
1272 have_fribidi="yes"
1273 AC_DEFINE([HAVE_FRIBIDI], [1], [have fribidi support])
1274 requirements_pc_evas="fribidi ${requirements_pc_evas}"
1275 requirements_pc_deps_evas="fribidi ${requirements_pc_deps_evas}"
1276 CPPFLAGS_SAVE="$CPPFLAGS"
1277 CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS"
1278 AC_CHECK_SIZEOF([FriBidiChar], [], [#include <fribidi/fribidi.h>])
1279 CPPFLAGS="$CPPFLAGS_SAVE"
1280 ])
1281fi
1282
1283# harfbuzz support
1284have_harfbuzz="no"
1285have_harfbuzz_ft="no"
1286if test "x${want_harfbuzz}" = "xyes" -o "x${want_harfbuzz}" = "xauto" ; then
1287 PKG_CHECK_EXISTS([harfbuzz >= 0.9.0],
1288 [
1289 have_harfbuzz="yes"
1290 requirements_pc_evas="harfbuzz ${requirements_pc_evas}"
1291 requirements_pc_deps_evas="harfbuzz ${requirements_pc_deps_evas}"
1292 ],
1293 [
1294 if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
1295 AC_MSG_ERROR([Harfbuzz not found (strict dependencies checking)])
1296 fi
1297 ])
1298fi
1299
1300if test "x${have_harfbuzz}" = "xno"; then
1301 HAS_HARFBUZZ=0
1302fi
1303
1304# Pixman
1305have_pixman="no"
1306if test "x${want_pixman}" = "xyes" || test "x${want_pixman}" = "xauto" ; then
1307 PKG_CHECK_EXISTS([pixman-1],
1308 [
1309 have_pixman="yes"
1310 AC_DEFINE([HAVE_PIXMAN], [1], [have pixman for rendering])
1311 requirements_pc_evas="pixman-1 ${requirements_pc_evas}"
1312 requirements_pc_deps_evas="pixman-1 ${requirements_pc_deps_evas}"
1313 ],
1314 [
1315 if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then
1316 AC_MSG_ERROR([Pixman not found (strict dependencies checking)])
1317 fi
1318 ])
1319fi
1320
1321if test "x${have_pixman}" = "xyes" ; then
1322 if test "x${have_pixman_font}" = "xyes" ; then
1323 AC_DEFINE(PIXMAN_FONT, 1, [Allow pixman to render fonts])
1324 fi
1325 if test "x${have_pixman_rect}" = "xyes" ; then
1326 AC_DEFINE(PIXMAN_RECT, 1, [Allow pixman to render rects])
1327 fi
1328 if test "x${have_pixman_line}" = "xyes" ; then
1329 AC_DEFINE(PIXMAN_LINE, 1, [Allow pixman to render lines])
1330 fi
1331 if test "x${have_pixman_poly}" = "xyes" ; then
1332 AC_DEFINE(PIXMAN_POLY, 1, [Allow pixman to render polys])
1333 fi
1334 if test "x${have_pixman_image}" = "xyes" ; then
1335 AC_DEFINE(PIXMAN_IMAGE, 1, [Allow pixman to render images])
1336 fi
1337 if test "x${have_pixman_image_scale_sample}" = "xyes" ; then
1338 AC_DEFINE(PIXMAN_IMAGE_SCALE_SAMPLE, 1, [Allow pixman to render image sampled scaling])
1339 fi
1340fi
1341
1342## Engines
1343
1344EVAS_CHECK_ENGINE([buffer], [${want_evas_engine_buffer}], [yes], [Buffer])
1345EVAS_CHECK_ENGINE([direct3d], [${want_evas_engine_direct3d}], [no], [Direct3D])
1346EVAS_CHECK_ENGINE([directfb], [${want_evas_engine_directfb}], [no], [DirectFB])
1347EVAS_CHECK_ENGINE([fb], [${want_evas_engine_fb}], [no], [Framebuffer])
1348EVAS_CHECK_ENGINE([gl-cocoa], [${want_evas_engine_gl_cocoa}], [no], [OpenGL Cocoa])
1349EVAS_CHECK_ENGINE([gl-sdl], [${want_evas_engine_gl_sdl}], [no], [OpenGL SDL])
1350EVAS_CHECK_ENGINE([psl1ght], [${want_evas_engine_psl1ght}], [no], [PSL1GHT])
1351EVAS_CHECK_ENGINE([software-gdi], [${want_evas_engine_software_gdi}], [no], [Software GDI])
1352EVAS_CHECK_ENGINE([software-ddraw], [${want_evas_engine_software_ddraw}], [no], [Software DirectDraw])
1353EVAS_CHECK_ENGINE([wayland-shm], [${want_evas_engine_wayland_shm}], [no], [Wayland Shm])
1354EVAS_CHECK_ENGINE([wayland-egl], [${want_evas_engine_wayland_egl}], [no], [Wayland Egl])
1355
1356# Software XCB
1357
1358have_evas_engine_software_xcb="no"
1359if test "x${want_xcb}" = "xyes" ; then
1360 EVAS_CHECK_ENGINE([software-xcb], [${want_evas_engine_software_xcb}], [no], [Software XCB])
1361else
1362 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XCB], [false])
1363 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_XCB], [false])
1364fi
1365
1366AC_MSG_CHECKING([whether to build Software XCB Engine])
1367AC_MSG_RESULT([${have_evas_engine_software_xcb}])
1368
1369# No Software XCB ? Then try Software Xlib
1370
1371have_evas_engine_software_xlib="no"
1372if test "x${have_evas_engine_software_xcb}" = "xno" ; then
1373 EVAS_CHECK_ENGINE([software-xlib], [${want_evas_engine_software_xlib}], [no], [Software Xlib])
1374else
1375 AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_XLIB], [false])
1376 AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [false])
1377fi
1378
1379AC_MSG_CHECKING([whether to build Software Xlib Engine])
1380AC_MSG_RESULT([${have_evas_engine_software_xlib}])
1381
1382# If software_x11 is available, define everything needed for X11
1383
1384have_evas_engine_software_x11="no"
1385if test "x${have_evas_engine_software_xlib}" = "xyes" || test "x${have_evas_engine_software_xcb}" = "xyes" ; then
1386 have_evas_engine_software_x11="yes"
1387 AC_DEFINE_UNQUOTED([BUILD_ENGINE_SOFTWARE_X11], [1], [Build software X11 engine])
1388fi
1389AM_CONDITIONAL([BUILD_ENGINE_SOFTWARE_X11], [test "x${have_evas_engine_software_x11}" = "xyes"])
1390
1391if test "x${have_evas_engine_software_xlib}" = "xstatic" || test "x${have_evas_engine_software_xcb}" = "xstatic"; then
1392 AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_SOFTWARE_X11], [1], [Build software X11 engine as part of libevas])
1393fi
1394AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_X11], [test "x${have_evas_engine_software_xcb}" = "xstatic" || test "x${have_evas_engine_software_xlib}" = "xstatic"])
1395
1396# Needed for evas-software-x11.pc
1397
1398AC_SUBST([have_evas_engine_software_xlib])
1399AC_SUBST([have_evas_engine_software_xcb])
1400
1401# Software generic
1402
1403AC_MSG_CHECKING([Whether to build software generic engine as part of libevas])
1404AC_MSG_RESULT([${have_static_software_generic}])
1405
1406if test "x${have_static_module}" = "xyes" && test "x${have_static_software_generic}" = "xno"; then
1407 AC_MSG_WARN([Forcing --enable-static-software-generic as engines must be compiled statically])
1408 have_static_software_generic="yes"
1409fi
1410
1411if test "x${have_static_software_generic}" = "xyes"; then
1412 AC_DEFINE([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [1], [Build software generic engine as part of libevas])
1413fi
1414
1415AM_CONDITIONAL([EVAS_STATIC_BUILD_SOFTWARE_GENERIC], [test "x${have_static_software_generic}" = "xyes"])
1416
1417# OpenGL
1418
1419AC_MSG_CHECKING([whether to build GLES flavor of GL])
1420AC_MSG_RESULT([${gl_flavor_gles}])
1421
1422if test "x${gl_flavor_gles}" = "xyes" ; then
1423 AC_DEFINE(GL_GLES, 1, [GLSL runtime shader GLES2 support])
1424fi
1425
1426# OpenGL XCB
1427
1428have_evas_engine_gl_xcb="no"
1429if test "x${want_gl_xcb}" = "xyes" ; then
1430 EVAS_CHECK_ENGINE([gl-xcb], [${want_evas_engine_gl_xcb}], [no], [OpenGL XCB])
1431else
1432 AM_CONDITIONAL([BUILD_ENGINE_GL_XCB], [false])
1433 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XCB], [false])
1434fi
1435
1436AC_MSG_CHECKING([whether to build OpenGL XCB Engine])
1437AC_MSG_RESULT([${have_evas_engine_gl_xcb}])
1438
1439# No openGL XCB ? Then try OpenGL Xlib
1440
1441have_evas_engine_gl_xlib="no"
1442if test "x${have_evas_engine_gl_xcb}" = "xno" ; then
1443 EVAS_CHECK_ENGINE([gl-xlib], [${want_evas_engine_gl_xlib}], [no], [OpenGL XLib])
1444else
1445 AM_CONDITIONAL([BUILD_ENGINE_GL_XLIB], [false])
1446 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_XLIB], [false])
1447fi
1448
1449AC_MSG_CHECKING([whether to build OpenGL Xlib Engine])
1450AC_MSG_RESULT([${have_evas_engine_gl_xlib}])
1451
1452# If opengl_x11 is available, define everything needed for X11
1453
1454have_evas_engine_gl_x11="no"
1455if test "x${have_evas_engine_gl_xlib}" = "xyes" || test "x${have_evas_engine_gl_xcb}" = "xyes" ; then
1456 have_evas_engine_gl_x11="yes"
1457 AC_DEFINE_UNQUOTED([BUILD_ENGINE_GL_X11], [1], [Build OpenGL X11 engine])
1458fi
1459AM_CONDITIONAL([BUILD_ENGINE_GL_X11], [test "x${have_evas_engine_gl_x11}" = "xyes"])
1460
1461if test "x${have_evas_engine_gl_xlib}" = "xstatic" || test "x${have_evas_engine_gl_xcb}" = "xstatic"; then
1462 AC_DEFINE_UNQUOTED([EVAS_STATIC_BUILD_GL_X11], [1], [Build OpenGL X11 engine as part of libevas])
1463fi
1464AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_X11], [test "x${have_evas_engine_gl_xcb}" = "xstatic" || test "x${have_evas_engine_gl_xlib}" = "xstatic"])
1465
1466# Needed for evas-opengl-x11.pc
1467
1468AC_SUBST([have_evas_engine_gl_xlib])
1469AC_SUBST([have_evas_engine_gl_xcb])
1470
1471# OpenGL SDL
1472
1473if test "x$have_evas_engine_gl_sdl" = "xyes" || test "x$have_evas_engine_gl_sdl" = "xstatic" ; then
1474 AC_CHECK_DECL([SDL_GL_CONTEXT_MAJOR_VERSION],
1475 [AC_DEFINE([HAVE_SDL_GL_CONTEXT_VERSION], [1], [SDL_GL version attributes present])],,
1476 [#include <SDL/SDL_video.h>])
1477fi
1478
1479if test "x${gl_flavor_gles}" = "xyes"; then
1480 AC_CHECK_DECL([SDL_OPENGLES],
1481 [AC_DEFINE([HAVE_SDL_FLAG_OPENGLES], [1], [SDL_OPENGLES flag is present])],,
1482 [#include <SDL/SDL_video.h>])
1483fi
1484
1485# OpenGL common
1486evas_engine_gl_common_cflags=""
1487evas_engine_gl_common_libs=""
1488AC_SUBST([evas_engine_gl_common_cflags])
1489AC_SUBST([evas_engine_gl_common_libs])
1490
1491have_evas_engine_gl_common="no"
1492have_static_evas_engine_gl_common="no"
1493if test "x$have_evas_engine_gl_xlib" = "xyes" || \
1494 test "x$have_evas_engine_gl_xcb" = "xyes" || \
1495 test "x$have_evas_engine_gl_sdl" = "xyes" || \
1496 test "x$have_evas_engine_gl_cocoa" = "xyes" || \
1497 test "x$have_evas_engine_wayland_egl" = "xyes"; then
1498 have_evas_engine_gl_common="yes"
1499fi
1500if test "x$have_evas_engine_gl_xlib" = "xstatic" || \
1501 test "x$have_evas_engine_gl_xcb" = "xstatic" || \
1502 test "x$have_evas_engine_gl_sdl" = "xstatic" || \
1503 test "x$have_evas_engine_gl_cocoa" = "xstatic" || \
1504 test "x$have_evas_engine_wayland_egl" = "xstatic"; then
1505 have_evas_engine_gl_common="yes"
1506 have_static_evas_engine_gl_common="yes"
1507fi
1508
1509if test "x${have_evas_engine_gl_common}" = "xyes"; then
1510 AC_DEFINE([BUILD_ENGINE_GL_COMMON], [1], [Generic OpenGL Rendering Support])
1511fi
1512
1513AM_CONDITIONAL([BUILD_ENGINE_GL_COMMON], [test "x$have_evas_engine_gl_common" = "xyes"])
1514
1515if test "x${have_static_evas_engine_gl_common}" = "xyes"; then
1516 AC_DEFINE([EVAS_STATIC_BUILD_GL_COMMON], [1], [Build GL generic engine as part of libevas])
1517fi
1518
1519AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test "x${have_static_evas_engine_gl_common}" = "xyes"])
1520
1521# SDL
1522
1523AC_MSG_CHECKING([whether to use SDL primitive when possible])
1524AC_MSG_RESULT([${sdl_primitive}])
1525
1526if test "x${sdl_primitive}" = "xyes" ; then
1527 AC_DEFINE([ENGINE_SDL_PRIMITIVE], [1], [Use SDL primitive when possible])
1528fi
1529
1530## Image Loaders
1531
1532EVAS_CHECK_IMAGE_LOADER([BMP], [${want_evas_image_loader_bmp}])
1533EVAS_CHECK_IMAGE_LOADER([Eet], [${want_evas_image_loader_eet}])
1534EVAS_CHECK_IMAGE_LOADER([Generic], [${want_evas_image_loader_generic}])
1535EVAS_CHECK_IMAGE_LOADER([Gif], [${want_evas_image_loader_gif}])
1536EVAS_CHECK_IMAGE_LOADER([ICO], [${want_evas_image_loader_ico}])
1537EVAS_CHECK_IMAGE_LOADER([JPEG], [${want_evas_image_loader_jpeg}])
1538EVAS_CHECK_IMAGE_LOADER([PMAPS], [${want_evas_image_loader_pmaps}])
1539EVAS_CHECK_IMAGE_LOADER([PNG], [${want_evas_image_loader_png}])
1540EVAS_CHECK_IMAGE_LOADER([PSD], [${want_evas_image_loader_psd}])
1541EVAS_CHECK_IMAGE_LOADER([SVG], [${want_evas_image_loader_svg}])
1542EVAS_CHECK_IMAGE_LOADER([Tga], [${want_evas_image_loader_tga}])
1543EVAS_CHECK_IMAGE_LOADER([Tiff], [${want_evas_image_loader_tiff}])
1544EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}])
1545EVAS_CHECK_IMAGE_LOADER([WEBP], [${want_evas_image_loader_webp}])
1546EVAS_CHECK_IMAGE_LOADER([XPM], [${want_evas_image_loader_xpm}])
1547
1548dnl Windows has no sigsetjmp function, nor equivalent.
1549dnl So we disable the jpeg saver.
1550dnl TODO: must find a workaround
1551case "$host_os" in
1552 mingw*)
1553 ;;
1554 *)
1555 if test "x${have_evas_image_loader_jpeg}" = "xyes" ; then
1556 AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver])
1557 have_evas_image_saver_jpeg="yes"
1558 fi
1559 ;;
1560esac
1561
1562AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"])
1563
1564PKG_CHECK_MODULES([EVAS], [${requirements_pc_deps_evas}])
1565
1566EVAS_LIBS="${EVAS_LIBS} ${requirements_libs_deps_evas}"
1567
1568### Checks for header files
1569
1570if test "x$have_harfbuzz" = "xyes" ; then
1571
1572 CPPFLAGS_SAVE="$CPPFLAGS"
1573 CPPFLAGS="$CPPFLAGS $EVAS_CFLAGS"
1574# must have for usage with harfbuzz although harfbuzz may not have it.
1575
1576 AC_CHECK_HEADER([hb-ft.h],
1577 [
1578 have_harfbuzz_ft="yes"
1579 #Depend on harfbuzz ft for harfbuzz support
1580 AC_DEFINE([HAVE_HARFBUZZ], [1], [have harfbuzz support])
1581 ],
1582 [
1583 if test "x$want_harfbuzz" = "xyes" && test "x$use_strict" = "xyes" ; then
1584 AC_MSG_ERROR([Harfbuzz-ft not found (strict dependencies checking)])
1585 fi
1586 have_harfbuzz="no"
1587 ])
1588 CPPFLAGS="$CPPFLAGS_SAVE"
1589fi
1590
1591### Checks for types
1592
1593CPPFLAGS_SAVE="$CPPFLAGS"
1594CPPFLAGS="$CPPFLAGS -Isrc/lib/eina"
1595AC_CHECK_SIZEOF([Eina_Unicode], [], [#include <Eina.h>])
1596CPPFLAGS="$CPPFLAGS_SAVE"
1597
1598### Checks for structures
1599
1600AC_CHECK_TYPES([struct sigaction], [], [],
1601 [[#include <signal.h>]])
1602
1603### Checks for compiler characteristics
1604
1605### Checks for linker characteristics
1606
1607### Checks for library functions
1608
1609AC_CHECK_FUNCS([siglongjmp])
1610
1611res=no
1612AC_CHECK_LIB([m], [lround], [res=yes], [res=no])
1613if test "x${res}" = "xyes" ; then
1614 AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists])
1615fi
1616
1617if test "x${want_evas_image_loader_generic}" = "xyes" || test "x${want_evas_cserve2}" = "xyes" ; then
1618 EFL_CHECK_FUNC([EVAS], [shm_open])
1619fi
1620
1621# cserve2 only works on Linux so far.
1622
1623if test "x${efl_func_shm_open}" = "xno" ; then
1624 want_evas_cserve2="no"
1625fi
1626
1627if test "x${want_evas_cserve2}" = "xyes" ; then
1628 AC_CHECK_HEADERS([sys/epoll.h sys/inotify.h sys/signalfd.h],
1629 [],
1630 [want_evas_cserve2="no"])
1631fi
1632
1633if test "x${want_evas_cserve2}" = "xyes" ; then
1634 AC_DEFINE([EVAS_CSERVE2], [1], [Shared cache server.])
1635fi
1636AM_CONDITIONAL([EVAS_CSERVE2], [test "x${want_evas_cserve2}" = "xyes"])
1637
1638### Configuration
1639
1640## Tile rotation
1641
1642if test "x${have_tile_rotate}" = "xyes" ; then
1643 AC_DEFINE(TILE_ROTATE, 1, [Enable tiled rotate algorithm])
1644fi
1645
1646## CPU architecture specific assembly
1647
1648build_cpu_mmx="no"
1649build_cpu_sse3="no"
1650build_cpu_altivec="no"
1651build_cpu_neon="no"
1652
1653case $host_cpu in
1654 i*86|x86_64|amd64)
1655 AC_DEFINE([BUILD_MMX], [1], [Build MMX Code])
1656 build_cpu_mmx="yes"
1657 build_cpu_sse3="yes"
1658 ;;
1659 *power* | *ppc*)
1660 build_cpu_altivec="yes"
1661 AC_CHECK_HEADER([altivec.h],
1662 [
1663 AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
1664 AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file])
1665 build_cpu_altivec="yes"
1666 ],
1667 [
1668 save_CFLAGS=$CFLAGS
1669 save_CPPFLAGS=$CPPFLAGS
1670 CFLAGS=$CFLAGS" -maltivec"
1671 CPPFLAGS=$CPPFLAGS" -maltivec"
1672 unset ac_cv_header_altivec_h
1673 AC_CHECK_HEADER([altivec.h],
1674 [
1675 AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
1676 AC_DEFINE([HAVE_ALTIVEC_H], [1], [Have altivec.h header file])
1677 build_cpu_altivec="yes"
1678 ],
1679 [build_cpu_altivec="no"]
1680 )
1681 CFLAGS=$save_CFLAGS
1682 CPPFLAGS=$save_CPPFLAGS
1683 ]
1684 )
1685 if test "x${build_cpu_altivec}" = "xyes"; then
1686 AC_MSG_CHECKING([whether to use altivec compiler flag])
1687 if test "x$GCC" = "xyes"; then
1688 if echo "int main(){return 0;}" | ${CPP} -faltivec - > /dev/null 2>&1; then
1689 altivec_cflags="-faltivec"
1690 AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
1691 elif echo "int main(){return 0;}" | ${CPP} -maltivec - > /dev/null 2>&1; then
1692 altivec_cflags="-maltivec"
1693 AC_DEFINE([BUILD_ALTIVEC], [1], [Build Altivec Code])
1694 fi
1695 fi
1696 AC_MSG_RESULT([${altivec_cflags}])
1697 CFLAGS="$CFLAGS ${altivec_cflags}"
1698 fi
1699 ;;
1700 arm*)
1701 build_cpu_neon="yes"
1702 AC_MSG_CHECKING([whether to use NEON instructions])
1703 AC_TRY_COMPILE([#include <arm_neon.h>],
1704 [asm volatile ("vqadd.u8 d0, d1, d0\n")],
1705 [
1706 AC_MSG_RESULT([yes])
1707 AC_DEFINE([BUILD_NEON], [1], [Build NEON Code])
1708 build_cpu_neon="yes"
1709 ],
1710 [
1711 AC_MSG_RESULT([no])
1712 build_cpu_neon="no"
1713 ])
1714 ;;
1715esac
1716
1717AC_SUBST([altivec_cflags])
1718
1719# SSE3
1720
1721if test "x${want_sse3}" = "xyes" && test "x${build_cpu_sse3}" = "xyes" ; then
1722 AC_CHECK_HEADER([immintrin.h],
1723 [AC_DEFINE(BUILD_SSE3, 1, [Build SSE3 Code])],
1724 [build_cpu_sse3="no"])
1725else
1726 build_cpu_sse3="no"
1727fi
1728
1729AC_MSG_CHECKING([whether to build sse3 code])
1730AC_MSG_RESULT([${build_cpu_sse3}])
1731
1732EVAS_SSE3_CFLAGS=" "
1733EVAS_ALTIVEC_CFLAGS=" "
1734
1735if test "x$build_cpu_sse3" = "xyes" ; then
1736 EVAS_SSE3_CFLAGS="-msse3"
1737fi
1738if test "x$build_cpu_altivec" = "xyes" ; then
1739 EVAS_ALTIVEC_CFLAGS="-maltivec"
1740fi
1741
1742AC_SUBST([CFLAGS])
1743AC_SUBST([EVAS_ALTIVEC_CFLAGS])
1744AC_SUBST([EVAS_SSE3_CFLAGS])
1745
1746## dither options
1747
1748# Small dither mask instead of big one (lower quality)
1749EVAS_CHECK_DITHER([small-dither-mask], [small dither mask], [conv_small_dither="yes"], [conv_small_dither="no"])
1750# Alternate Line dither mask instead of big one (lower quality - but fastest)
1751EVAS_CHECK_DITHER([line-dither-mask], [line dither mask], [conv_line_dither="yes"], [conv_line_dither="no"])
1752# No dither mask at all for 16bpp
1753EVAS_CHECK_DITHER([no-dither-mask], [conversion to 16bpp without dither mask], [conv_no_dither="yes"], [conv_no_dither="no"])
1754
1755#### End of Evas
1756
1757
820#### Embryo 1758#### Embryo
821 1759
822AC_MSG_NOTICE([Embryo checks]) 1760AC_MSG_NOTICE([Embryo checks])
@@ -887,8 +1825,6 @@ src/examples/eina/Makefile
887src/examples/eet/Makefile 1825src/examples/eet/Makefile
888src/examples/eo/Makefile 1826src/examples/eo/Makefile
889src/lib/eina/eina_config.h 1827src/lib/eina/eina_config.h
890src/scripts/Makefile
891src/scripts/eina/Makefile
892src/tests/Makefile 1828src/tests/Makefile
893src/tests/eina/Makefile 1829src/tests/eina/Makefile
894src/tests/eet/Makefile 1830src/tests/eet/Makefile
@@ -899,6 +1835,21 @@ pc/eina.pc
899pc/eet.pc 1835pc/eet.pc
900pc/eo.pc 1836pc/eo.pc
901pc/embryo.pc 1837pc/embryo.pc
1838pc/evas-direct3d.pc
1839pc/evas-directfb.pc
1840pc/evas-fb.pc
1841pc/evas-opengl-x11.pc
1842pc/evas-opengl-sdl.pc
1843pc/evas-opengl-cocoa.pc
1844pc/evas-psl1ght.pc
1845pc/evas-software-buffer.pc
1846pc/evas-software-x11.pc
1847pc/evas-software-gdi.pc
1848pc/evas-software-ddraw.pc
1849pc/evas-software-sdl.pc
1850pc/evas-wayland-shm.pc
1851pc/evas-wayland-egl.pc
1852pc/evas.pc
902]) 1853])
903 1854
904AC_OUTPUT 1855AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 6ab1f988af..e3dc4c262c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,9 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3filesdir = $(datadir)/embryo/include 3embryofilesdir = $(datadir)/embryo/include
4files_DATA = embryo/default.inc 4embryofiles_DATA = embryo/default.inc
5 5
6EXTRA_DIST = $(files_DATA) 6evasfilesdir = $(datadir)/evas
7evasfiles_DATA = evas/checkme
8
9EXTRA_DIST = embryo/default.inc evas/checkme
diff --git a/legacy/evas/data/checkme b/data/evas/checkme
index 987063d4cb..987063d4cb 100644
--- a/legacy/evas/data/checkme
+++ b/data/evas/checkme
diff --git a/m4/efl_attribute.m4 b/m4/efl_attribute.m4
index cd42e9cda6..4f31d93175 100644
--- a/m4/efl_attribute.m4
+++ b/m4/efl_attribute.m4
@@ -29,4 +29,55 @@ if test "x${have_attribute_vector}" = "xyes" ; then
29fi 29fi
30]) 30])
31 31
32dnl Usage: EFL_ATTRIBUTE_ALWAYS_INLINE
33dnl call AC_DEFINE for alway_inline if __attribute__((always_inline)) is available
34
35AC_DEFUN([EFL_ATTRIBUTE_ALWAYS_INLINE],
36[
37
38have_attribute_forceinline="no"
39
40AC_MSG_CHECKING([for __forceinline])
41
42AC_COMPILE_IFELSE(
43 [AC_LANG_PROGRAM(
44 [[
45#include <windows.h>
46static __forceinline void foo(void) {}
47 ]],
48 [[
49 ]])],
50 [
51 have_attribute_always_inline="yes"
52 have_attribute_forceinline="yes"
53 ],
54 [have_attribute_always_inline="no"])
55
56AC_MSG_RESULT([${have_attribute_always_inline}])
57
58if test "x${have_attribute_always_inline}" = "xno" ; then
59 AC_MSG_CHECKING([for __attribute__ ((__always_inline__))])
60 AC_COMPILE_IFELSE(
61 [AC_LANG_PROGRAM(
62 [[
63static __attribute__((__always_inline__)) inline void foo(void) {}
64 ]],
65 [[
66 ]])],
67 [have_attribute_always_inline="yes"],
68 [have_attribute_always_inline="no"])
69 AC_MSG_RESULT([${have_attribute_always_inline}])
70fi
71
72if test "x${have_attribute_always_inline}" = "xyes" ; then
73 if test "x${have_attribute_forceinline}" = "xyes" ; then
74 AC_DEFINE([EFL_ALWAYS_INLINE], [__forceinline], [Macro declaring a function to always be inlined.])
75 else
76 AC_DEFINE([EFL_ALWAYS_INLINE], [__attribute__ ((__always_inline__)) inline], [Macro declaring a function to always be inlined.])
77 fi
78else
79 AC_DEFINE([EFL_ALWAYS_INLINE], [static inline], [Macro declaring a function to always be inlined.])
80fi
81])
82
32dnl End of efl_attribute.m4 83dnl End of efl_attribute.m4
diff --git a/m4/efl_check_funcs.m4 b/m4/efl_check_funcs.m4
index 23712bcdd7..109ad067d5 100644
--- a/m4/efl_check_funcs.m4
+++ b/m4/efl_check_funcs.m4
@@ -53,11 +53,14 @@ LIBS="${LIBS} $2"
53AC_LINK_IFELSE( 53AC_LINK_IFELSE(
54 [AC_LANG_PROGRAM( 54 [AC_LANG_PROGRAM(
55 [[ 55 [[
56#define _GNU_SOURCE 56#ifndef _GNU_SOURCE
57# define _GNU_SOURCE
58#endif
59#include <stdlib>
57#include <dlfcn.h> 60#include <dlfcn.h>
58 ]], 61 ]],
59 [[ 62 [[
60int res = dladdr(0, 0); 63int res = dladdr(NULL, NULL);
61 ]])], 64 ]])],
62 [ 65 [
63 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2" 66 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2"
@@ -171,6 +174,75 @@ m4_popdef([DOWNEFL])
171m4_popdef([UPEFL]) 174m4_popdef([UPEFL])
172]) 175])
173 176
177dnl _EFL_CHECK_FUNC_DLSYM_PRIV is for internal use
178dnl _EFL_CHECK_FUNC_DLSYM_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
179
180AC_DEFUN([_EFL_CHECK_FUNC_DLSYM_PRIV],
181[
182m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
183m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
184
185LIBS_save="${LIBS}"
186LIBS="${LIBS} $2"
187AC_LINK_IFELSE(
188 [AC_LANG_PROGRAM(
189 [[
190#ifndef _GNU_SOURCE
191# define _GNU_SOURCE
192#endif
193#include <stdlib.h>
194#include <dlfcn.h>
195 ]],
196 [[
197void *res = dlsym(NULL, NULL);
198 ]])],
199 [
200 m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} $2"
201 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} $2"
202 _efl_have_fct="yes"
203 ],
204 [_efl_have_fct="no"])
205
206LIBS="${LIBS_save}"
207
208AS_IF([test "x${_efl_have_fct}" = "xyes"], [$3], [$4])
209
210m4_popdef([DOWNEFL])
211m4_popdef([UPEFL])
212])
213
214dnl _EFL_CHECK_FUNC_DLSYM is for internal use
215dnl _EFL_CHECK_FUNC_DLSYM(EFL, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
216
217AC_DEFUN([_EFL_CHECK_FUNC_DLSYM],
218[
219m4_pushdef([UPEFL], m4_translit([$1], [-a-z], [_A-Z]))dnl
220m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
221
222case "$host_os" in
223 mingw*)
224 _efl_have_fct="yes"
225 requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_[]m4_defn([DOWNEFL])} -ldl"
226 ;;
227 *)
228 _efl_have_fct="no"
229
230dnl Check is dlsym is in libc
231 _EFL_CHECK_FUNC_DLSYM_PRIV([$1], [], [_efl_have_fct="yes"], [_efl_have_fct="no"])
232
233dnl Check is dlopen is in libdl
234 if test "x${_efl_have_fct}" = "xno" ; then
235 _EFL_CHECK_FUNC_DLSYM_PRIV([$1], [-ldl], [_efl_have_fct="yes"], [_efl_have_fct="no"])
236 fi
237 ;;
238esac
239
240AS_IF([test "x${_efl_have_fct}" = "xyes"], [$2], [$3])
241
242m4_popdef([DOWNEFL])
243m4_popdef([UPEFL])
244])
245
174dnl _EFL_CHECK_FUNC_FNMATCH_PRIV is for internal use 246dnl _EFL_CHECK_FUNC_FNMATCH_PRIV is for internal use
175dnl _EFL_CHECK_FUNC_FNMATCH_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) 247dnl _EFL_CHECK_FUNC_FNMATCH_PRIV(EFL, LIB, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
176 248
diff --git a/m4/eina_config.m4 b/m4/eina_config.m4
index 3a0e50b526..609e4f9c74 100644
--- a/m4/eina_config.m4
+++ b/m4/eina_config.m4
@@ -4,5 +4,5 @@ AC_DEFUN([EINA_CONFIG],
4if $2; then 4if $2; then
5 EINA_CONFIGURE_$1="#define EINA_$1" 5 EINA_CONFIGURE_$1="#define EINA_$1"
6fi 6fi
7AC_SUBST(EINA_CONFIGURE_$1) 7AC_SUBST([EINA_CONFIGURE_$1])
8]) 8])
diff --git a/legacy/evas/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index f79634db45..78c4acccd3 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
53 evas_engine_[]$1[]_libs="${x_libs}" 53 evas_engine_[]$1[]_libs="${x_libs}"
54fi 54fi
55 55
56if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
57 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
58 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
59fi
60
56AC_SUBST([evas_engine_$1_cflags]) 61AC_SUBST([evas_engine_$1_cflags])
57AC_SUBST([evas_engine_$1_libs]) 62AC_SUBST([evas_engine_$1_libs])
58 63
@@ -123,15 +128,15 @@ if test "x${have_dep}" = "xyes" ; then
123fi 128fi
124 129
125if test "x${have_dep}" = "xyes" ; then 130if test "x${have_dep}" = "xyes" ; then
126 AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], -lX11 -lXext -lXrender -lm $gl_pt_lib) 131 AC_CHECK_LIB([GL], [glXCreateContext], [have_dep="yes"], [have_dep="no"], [-lX11 -lXext -lXrender -lm $gl_pt_lib])
127fi 132fi
128 133
129if test "x$gl_flavor_gles" = "xyes" ; then 134if test "x${gl_flavor_gles}" = "xyes" ; then
130 have_dep=no 135 have_dep=no
131fi 136fi
132 137
133if test "x${have_dep}" = "xyes" ; then 138if test "x${have_dep}" = "xyes" ; then
134 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) 139 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
135 if test "x${have_dep}" = "xyes" ; then 140 if test "x${have_dep}" = "xyes" ; then
136 if test "x$2" = "xyes" ; then 141 if test "x$2" = "xyes" ; then
137 x_libs="${x_libs} -lX11 -lXext -lXrender" 142 x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -168,7 +173,7 @@ else
168 if test "x${have_egl}" = "xyes" ; then 173 if test "x${have_egl}" = "xyes" ; then
169 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 174 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
170 if test "x${have_glesv2}" = "xyes" ; then 175 if test "x${have_glesv2}" = "xyes" ; then
171 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) 176 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
172 if test "x${have_dep}" = "xyes" ; then 177 if test "x${have_dep}" = "xyes" ; then
173 evas_engine_[]$1[]_cflags="${x_cflags}" 178 evas_engine_[]$1[]_cflags="${x_cflags}"
174 evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 179 evas_engine_[]$1[]_libs="${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
@@ -181,6 +186,11 @@ else
181 fi 186 fi
182fi 187fi
183 188
189if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
190 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
191 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
192fi
193
184AC_SUBST([evas_engine_$1_cflags]) 194AC_SUBST([evas_engine_$1_cflags])
185AC_SUBST([evas_engine_$1_libs]) 195AC_SUBST([evas_engine_$1_libs])
186 196
@@ -208,20 +218,20 @@ PKG_CHECK_MODULES([XCB],
208 [ 218 [
209 have_dep="yes" 219 have_dep="yes"
210 requirement="xcb xcb-shm xcb-image pixman-1" 220 requirement="xcb xcb-shm xcb-image pixman-1"
211 evas_engine_[]$1[]_cflags="${XCB_CFLAGS}" 221 ],
212 evas_engine_[]$1[]_libs="${XCB_LIBS}" 222 [have_dep="no"])
213 ],[
214 have_dep="no"
215 ]
216)
217 223
218AC_SUBST([evas_engine_$1_cflags]) 224evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
219AC_SUBST([evas_engine_$1_libs]) 225evas_engine_[]$1[]_libs="${XCB_LIBS}"
220 226
221if test "x$3" = "xstatic" ; then 227if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
222 requirement_evas="${requirement} ${requirement_evas}" 228 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
229 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
223fi 230fi
224 231
232AC_SUBST([evas_engine_$1_cflags])
233AC_SUBST([evas_engine_$1_libs])
234
225if test "x${have_dep}" = "xyes" ; then 235if test "x${have_dep}" = "xyes" ; then
226 m4_default([$4], [:]) 236 m4_default([$4], [:])
227else 237else
@@ -236,6 +246,8 @@ dnl use: EVAS_CHECK_ENGINE_DEP_GL_XCB(engine, simple, want_static[, ACTION-IF-FO
236AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB], 246AC_DEFUN([EVAS_CHECK_ENGINE_DEP_GL_XCB],
237[ 247[
238 248
249requirement=""
250have_dep="no"
239evas_engine_[]$1[]_cflags="" 251evas_engine_[]$1[]_cflags=""
240evas_engine_[]$1[]_libs="" 252evas_engine_[]$1[]_libs=""
241 253
@@ -293,19 +305,18 @@ PKG_CHECK_MODULES([XCB_GL],
293 [ 305 [
294 have_dep="yes" 306 have_dep="yes"
295 requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil" 307 requirement="x11-xcb xcb xcb-glx xcb-render xcb-renderutil"
296 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}" 308 ],
297 evas_engine_[]$1[]_libs="${XCB_GL_LIBS}" 309 [have_dep="no"])
298 ],[ 310
299 have_dep="no" 311evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS}"
300 ] 312evas_engine_[]$1[]_libs="${XCB_GL_LIBS}"
301)
302 313
303if test "x$gl_flavor_gles" = "xyes" ; then 314if test "x$gl_flavor_gles" = "xyes" ; then
304 have_dep=no 315 have_dep=no
305fi 316fi
306 317
307if test "x${have_dep}" = "xyes" ; then 318if test "x${have_dep}" = "xyes" ; then
308 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) 319 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
309 if test "x${have_dep}" = "xyes" ; then 320 if test "x${have_dep}" = "xyes" ; then
310 if test "x$2" = "xyes" ; then 321 if test "x$2" = "xyes" ; then
311 x_libs="${x_libs} -lX11 -lXext -lXrender" 322 x_libs="${x_libs} -lX11 -lXext -lXrender"
@@ -337,7 +348,7 @@ else
337 if test "x${have_egl}" = "xyes" ; then 348 if test "x${have_egl}" = "xyes" ; then
338 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib) 349 AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL ${x_libs} -lm $gl_pt_lib)
339 if test "x${have_glesv2}" = "xyes" ; then 350 if test "x${have_glesv2}" = "xyes" ; then
340 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) 351 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
341 if test "x${have_dep}" = "xyes" ; then 352 if test "x${have_dep}" = "xyes" ; then
342 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}" 353 evas_engine_[]$1[]_cflags="${XCB_GL_CFLAGS} ${x_cflags}"
343 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib" 354 evas_engine_[]$1[]_libs="${XCB_GL_LIBS} ${x_libs} -lGLESv2 -lEGL -lm $gl_pt_lib"
@@ -350,6 +361,13 @@ else
350 fi 361 fi
351fi 362fi
352 363
364if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
365 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
366 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
367 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
368 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
369fi
370
353AC_SUBST([evas_engine_$1_cflags]) 371AC_SUBST([evas_engine_$1_cflags])
354AC_SUBST([evas_engine_$1_libs]) 372AC_SUBST([evas_engine_$1_libs])
355 373
@@ -375,8 +393,12 @@ AC_CHECK_HEADER([windows.h],
375 [ 393 [
376 have_dep="yes" 394 have_dep="yes"
377 evas_engine_[]$1[]_libs="-lgdi32" 395 evas_engine_[]$1[]_libs="-lgdi32"
378 ] 396 ])
379) 397
398if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
399 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
400 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
401fi
380 402
381AC_SUBST([evas_engine_$1_cflags]) 403AC_SUBST([evas_engine_$1_cflags])
382AC_SUBST([evas_engine_$1_libs]) 404AC_SUBST([evas_engine_$1_libs])
@@ -402,8 +424,12 @@ AC_CHECK_HEADER([ddraw.h],
402 [ 424 [
403 have_dep="yes" 425 have_dep="yes"
404 evas_engine_[]$1[]_libs="-lddraw" 426 evas_engine_[]$1[]_libs="-lddraw"
405 ] 427 ])
406) 428
429if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
430 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
431 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
432fi
407 433
408AC_SUBST([evas_engine_$1_cflags]) 434AC_SUBST([evas_engine_$1_cflags])
409AC_SUBST([evas_engine_$1_libs]) 435AC_SUBST([evas_engine_$1_libs])
@@ -429,8 +455,12 @@ AC_CHECK_HEADERS([d3d9.h d3dx9.h],
429 have_dep="yes" 455 have_dep="yes"
430 evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9 -lgdi32" 456 evas_engine_[]$1[]_libs="-ld3d9 -ld3dx9 -lgdi32"
431 ], 457 ],
432 [have_dep="no"; break] 458 [have_dep="no"; break])
433) 459
460if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
461 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
462 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
463fi
434 464
435AC_SUBST([evas_engine_$1_cflags]) 465AC_SUBST([evas_engine_$1_cflags])
436AC_SUBST([evas_engine_$1_libs]) 466AC_SUBST([evas_engine_$1_libs])
@@ -481,7 +511,12 @@ LIBS="$LIBS_save"
481AC_LANG_POP([Objective C]) 511AC_LANG_POP([Objective C])
482 512
483if test "x${have_dep}" = "xyes" ; then 513if test "x${have_dep}" = "xyes" ; then
484 PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) 514 PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
515fi
516
517if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
518 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
519 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
485fi 520fi
486 521
487AC_SUBST([evas_engine_$1_cflags]) 522AC_SUBST([evas_engine_$1_cflags])
@@ -510,10 +545,10 @@ PKG_CHECK_MODULES([SDL],
510 [ 545 [
511 have_dep="yes" 546 have_dep="yes"
512 requirement="sdl" 547 requirement="sdl"
513 evas_engine_[]$1[]_cflags="${SDL_CFLAGS}" 548 ])
514 evas_engine_[]$1[]_libs="${SDL_LIBS}" 549
515 ] 550evas_engine_[]$1[]_cflags="${SDL_CFLAGS}"
516) 551evas_engine_[]$1[]_libs="${SDL_LIBS}"
517 552
518gl_pt_lib=""; 553gl_pt_lib="";
519have_gl_pt="no" 554have_gl_pt="no"
@@ -577,6 +612,13 @@ else
577 fi 612 fi
578fi 613fi
579 614
615if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
616 requirements_libs_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_evas}"
617 requirements_libs_deps_evas="${evas_engine_[]$1[]_libs} ${requirements_libs_deps_evas}"
618 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
619 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
620fi
621
580AC_SUBST([evas_engine_$1_cflags]) 622AC_SUBST([evas_engine_$1_cflags])
581AC_SUBST([evas_engine_$1_libs]) 623AC_SUBST([evas_engine_$1_libs])
582 624
@@ -631,52 +673,16 @@ PKG_CHECK_MODULES([DIRECTFB],
631 requirement="directfb" 673 requirement="directfb"
632 evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}" 674 evas_engine_[]$1[]_cflags="${DIRECTFB_CFLAGS}"
633 evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}" 675 evas_engine_[]$1[]_libs="${DIRECTFB_LIBS}"
634 ] 676 ])
635)
636
637AC_SUBST([evas_engine_$1_cflags])
638AC_SUBST([evas_engine_$1_libs])
639
640if test "x$3" = "xstatic" ; then
641 requirement_evas="${requirement} ${requirement_evas}"
642fi
643 677
644if test "x${have_dep}" = "xyes" ; then 678if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
645 m4_default([$4], [:]) 679 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
646else 680 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
647 m4_default([$5], [:])
648fi 681fi
649 682
650])
651
652dnl use: EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11(engine, simple, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
653
654AC_DEFUN([EVAS_CHECK_ENGINE_DEP_SOFTWARE_8_X11],
655[
656
657have_dep="no"
658evas_engine_[]$1[]_cflags=""
659evas_engine_[]$1[]_libs=""
660
661PKG_CHECK_MODULES([XCB],
662 [xcb xcb-shm xcb-image >= 0.2.1 pixman-1],
663 [
664 have_dep="yes"
665 requirement="xcb xcb-shm xcb-image pixman-1"
666 evas_engine_[]$1[]_cflags="${XCB_CFLAGS}"
667 evas_engine_[]$1[]_libs="${XCB_LIBS}"
668 ],[
669 have_dep="no"
670 ]
671)
672
673AC_SUBST([evas_engine_$1_cflags]) 683AC_SUBST([evas_engine_$1_cflags])
674AC_SUBST([evas_engine_$1_libs]) 684AC_SUBST([evas_engine_$1_libs])
675 685
676if test "x$3" = "xstatic" ; then
677 requirement_evas="${requirement} ${requirement_evas}"
678fi
679
680if test "x${have_dep}" = "xyes" ; then 686if test "x${have_dep}" = "xyes" ; then
681 m4_default([$4], [:]) 687 m4_default([$4], [:])
682else 688else
@@ -745,27 +751,27 @@ else
745 gl_library="gl" 751 gl_library="gl"
746fi 752fi
747 753
748PKG_CHECK_MODULES([GL_EET], [eet >= 1.6.99], [have_dep="yes"], [have_dep="no"]) 754PKG_CHECK_MODULES([GL_EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes"], [have_dep="no"])
749 755
750PKG_CHECK_MODULES([WAYLAND_EGL], 756PKG_CHECK_MODULES([WAYLAND_EGL],
751 [egl >= 7.10 ${gl_library} wayland-client wayland-egl], 757 [egl >= 7.10 ${gl_library} wayland-client wayland-egl],
752 [ 758 [
753 have_dep="yes" 759 have_dep="yes"
754 requirement="egl >= 7.10 ${gl_library} wayland-client wayland-egl" 760 requirement="egl ${gl_library} wayland-client wayland-egl"
755 evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}" 761 ],
756 evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}" 762 [have_dep="no"])
757 ],[
758 have_dep="no"
759 ]
760)
761 763
762AC_SUBST([evas_engine_$1_cflags]) 764evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
763AC_SUBST([evas_engine_$1_libs]) 765evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS}"
764 766
765if test "x$3" = "xstatic" ; then 767if test "x$3" = "xstatic" && test "x${have_dep}" = "xyes" ; then
766 requirement_evas="${requirement} ${requirement_evas}" 768 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
769 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
767fi 770fi
768 771
772AC_SUBST([evas_engine_$1_cflags])
773AC_SUBST([evas_engine_$1_libs])
774
769if test "x${have_dep}" = "xyes" ; then 775if test "x${have_dep}" = "xyes" ; then
770 m4_default([$4], [:]) 776 m4_default([$4], [:])
771else 777else
diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
new file mode 100644
index 0000000000..1b0831dcea
--- /dev/null
+++ b/m4/evas_check_loader.m4
@@ -0,0 +1,534 @@
1
2dnl use: EVAS_CHECK_LOADER_DEP_BMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
3
4AC_DEFUN([EVAS_CHECK_LOADER_DEP_BMP],
5[
6
7have_dep="yes"
8evas_image_loader_[]$1[]_cflags=""
9evas_image_loader_[]$1[]_libs=""
10
11AC_SUBST([evas_image_loader_$1_cflags])
12AC_SUBST([evas_image_loader_$1_libs])
13
14if test "x${have_dep}" = "xyes" ; then
15 m4_default([$3], [:])
16else
17 m4_default([$4], [:])
18fi
19
20])
21
22dnl use: EVAS_CHECK_LOADER_DEP_EET(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
23
24AC_DEFUN([EVAS_CHECK_LOADER_DEP_EET],
25[
26
27requirement=""
28have_dep="no"
29evas_image_loader_[]$1[]_cflags=""
30evas_image_loader_[]$1[]_libs=""
31
32PKG_CHECK_MODULES([EET], [eet >= ${PACKAGE_VERSION}], [have_dep="yes" requirement="eet >= ${PACKAGE_VERSION}"], [have_dep="no"])
33evas_image_loader_[]$1[]_cflags="${EET_CFLAGS}"
34evas_image_loader_[]$1[]_libs="${EET_LIBS}"
35
36AC_SUBST([evas_image_loader_$1_cflags])
37AC_SUBST([evas_image_loader_$1_libs])
38
39if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
40 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
41 requirements_pc_deps_evas="${requirements_pc_deps_evas}"
42fi
43
44if test "x${have_dep}" = "xyes" ; then
45 m4_default([$3], [:])
46else
47 m4_default([$4], [:])
48fi
49
50])
51
52dnl use: EVAS_CHECK_LOADER_DEP_GENERIC(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
53
54AC_DEFUN([EVAS_CHECK_LOADER_DEP_GENERIC],
55[
56
57have_dep="yes"
58evas_image_loader_[]$1[]_cflags=""
59evas_image_loader_[]$1[]_libs=""
60
61AC_SUBST([evas_image_loader_$1_cflags])
62AC_SUBST([evas_image_loader_$1_libs])
63
64if test "x${have_dep}" = "xyes" ; then
65 m4_default([$3], [:])
66else
67 m4_default([$4], [:])
68fi
69
70])
71
72dnl use: EVAS_CHECK_LOADER_DEP_GIF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
73
74AC_DEFUN([EVAS_CHECK_LOADER_DEP_GIF],
75[
76
77have_dep="no"
78evas_image_loader_[]$1[]_cflags=""
79evas_image_loader_[]$1[]_libs=""
80
81AC_CHECK_HEADER([gif_lib.h], [have_dep="yes"])
82
83if test "x${have_dep}" = "xyes" ; then
84 AC_CHECK_LIB([gif],
85 [DGifOpenFileName],
86 [
87 evas_image_loader_[]$1[]_libs="-lgif"
88 ],
89 [have_dep="no"]
90 )
91
92 if test "x${have_dep}" = "xno" ; then
93 AC_CHECK_LIB([ungif],
94 [DGifOpenFileName],
95 [
96 have_dep="yes"
97 evas_image_loader_[]$1[]_libs="-lungif"
98 ]
99 )
100 fi
101fi
102
103if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
104 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
105 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
106fi
107
108AC_SUBST([evas_image_loader_$1_cflags])
109AC_SUBST([evas_image_loader_$1_libs])
110
111if test "x${have_dep}" = "xyes" ; then
112 m4_default([$3], [:])
113else
114 m4_default([$4], [:])
115fi
116
117])
118
119dnl use: EVAS_CHECK_LOADER_DEP_ICO(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
120
121AC_DEFUN([EVAS_CHECK_LOADER_DEP_ICO],
122[
123
124have_dep="yes"
125evas_image_loader_[]$1[]_cflags=""
126evas_image_loader_[]$1[]_libs=""
127
128AC_SUBST([evas_image_loader_$1_cflags])
129AC_SUBST([evas_image_loader_$1_libs])
130
131if test "x${have_dep}" = "xyes" ; then
132 m4_default([$3], [:])
133else
134 m4_default([$4], [:])
135fi
136
137])
138
139dnl use: EVAS_CHECK_LOADER_DEP_JPEG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
140
141AC_DEFUN([EVAS_CHECK_LOADER_DEP_JPEG],
142[
143
144have_dep="no"
145evas_image_loader_[]$1[]_cflags=""
146evas_image_loader_[]$1[]_libs=""
147
148AC_CHECK_HEADER([jpeglib.h], [have_dep="yes"])
149
150if test "x${have_dep}" = "xyes" ; then
151 AC_CHECK_LIB([jpeg],
152 [jpeg_CreateDecompress],
153 [
154 evas_image_loader_[]$1[]_libs="-ljpeg"
155 AC_COMPILE_IFELSE(
156 [AC_LANG_PROGRAM(
157 [[
158#include <stdio.h>
159#include <jpeglib.h>
160#include <setjmp.h>
161 ]],
162 [[
163struct jpeg_decompress_struct decomp;
164decomp.region_x = 0;
165 ]])],
166 [have_jpeg_region="yes"],
167 [have_jpeg_region="no"])
168 ],
169 [have_dep="no"]
170 )
171 if test "x${have_jpeg_region}" = "xyes" ; then
172 AC_DEFINE(BUILD_LOADER_JPEG_REGION, [1], [JPEG Region Decode Support])
173 fi
174fi
175
176if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
177 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
178 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
179fi
180
181AC_SUBST([evas_image_loader_$1_cflags])
182AC_SUBST([evas_image_loader_$1_libs])
183
184if test "x${have_dep}" = "xyes" ; then
185 m4_default([$3], [:])
186else
187 m4_default([$4], [:])
188fi
189
190])
191
192dnl use: EVAS_CHECK_LOADER_DEP_PMAPS(loader, want_static[[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
193
194AC_DEFUN([EVAS_CHECK_LOADER_DEP_PMAPS],
195[
196
197have_dep="yes"
198evas_image_loader_[]$1[]_cflags=""
199evas_image_loader_[]$1[]_libs=""
200
201AC_SUBST([evas_image_loader_$1_cflags])
202AC_SUBST([evas_image_loader_$1_libs])
203
204if test "x${have_dep}" = "xyes" ; then
205 m4_default([$3], [:])
206else
207 m4_default([$4], [:])
208fi
209
210])
211
212dnl use: EVAS_CHECK_LOADER_DEP_PNG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
213
214AC_DEFUN([EVAS_CHECK_LOADER_DEP_PNG],
215[
216
217requirement=""
218have_dep="no"
219evas_image_loader_[]$1[]_cflags=""
220evas_image_loader_[]$1[]_libs=""
221
222dnl libpng.pc is the latest version of libpng that ahs been installed.
223dnl We check it first.
224PKG_CHECK_MODULES([PNG],
225 [libpng >= 1.2.10],
226 [have_dep="yes" requirement="libpng"],
227 [have_dep="no"])
228
229if test "x${have_dep}" = "xno" ; then
230 PKG_CHECK_MODULES([PNG],
231 [libpng15],
232 [have_dep="yes" requirement="libpng15"],
233 [have_dep="no"])
234fi
235
236if test "x${have_dep}" = "xno" ; then
237 PKG_CHECK_MODULES([PNG],
238 [libpng14],
239 [have_dep="yes" requirement="libpng14"],
240 [have_dep="no"])
241fi
242
243if test "x${have_dep}" = "xno" ; then
244 PKG_CHECK_MODULES([PNG],
245 [libpng12 >= 1.2.10],
246 [have_dep="yes" requirement="libpng12"],
247 [have_dep="no"])
248fi
249
250evas_image_loader_[]$1[]_cflags="${PNG_CFLAGS}"
251evas_image_loader_[]$1[]_libs="${PNG_LIBS}"
252
253AC_SUBST([evas_image_loader_$1_cflags])
254AC_SUBST([evas_image_loader_$1_libs])
255
256if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
257 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
258 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
259fi
260
261if test "x${have_dep}" = "xyes" ; then
262 m4_default([$3], [:])
263else
264 m4_default([$4], [:])
265fi
266
267])
268
269dnl use: EVAS_CHECK_LOADER_DEP_PSD(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
270
271AC_DEFUN([EVAS_CHECK_LOADER_DEP_PSD],
272[
273
274have_dep="yes"
275evas_image_loader_[]$1[]_cflags=""
276evas_image_loader_[]$1[]_libs=""
277
278AC_SUBST([evas_image_loader_$1_cflags])
279AC_SUBST([evas_image_loader_$1_libs])
280
281if test "x${have_dep}" = "xyes" ; then
282 m4_default([$3], [:])
283else
284 m4_default([$4], [:])
285fi
286
287])
288
289dnl use: EVAS_CHECK_LOADER_DEP_SVG(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
290
291AC_DEFUN([EVAS_CHECK_LOADER_DEP_SVG],
292[
293
294requirement=""
295have_esvg="no"
296evas_image_loader_[]$1[]_cflags=""
297evas_image_loader_[]$1[]_libs=""
298version_esvg="0.0.18"
299version_ender="0.0.6"
300
301PKG_CHECK_MODULES([SVG],
302 [esvg >= ${version_esvg} ender >= ${version_ender}],
303 [have_dep="yes" have_esvg="yes" requirement="esvg >= ${version_esvg} ender >= ${version_ender}"],
304 [have_dep="no"])
305
306if test "x${have_dep}" = "xyes" ; then
307 evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
308 evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
309fi
310
311AC_SUBST([evas_image_loader_$1_cflags])
312AC_SUBST([evas_image_loader_$1_libs])
313
314if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
315 requirements_pc_evas="${requirement} ${requirements_pc_evas}"
316 requirements_pc_deps_evas="${requirement} ${requirements_pc_deps_evas}"
317fi
318
319if test "x${have_dep}" = "xyes" ; then
320 m4_default([$3], [:])
321else
322 m4_default([$4], [:])
323fi
324
325])
326
327dnl use: EVAS_CHECK_LOADER_DEP_TGA(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
328
329AC_DEFUN([EVAS_CHECK_LOADER_DEP_TGA],
330[
331
332have_dep="yes"
333evas_image_loader_[]$1[]_cflags=""
334evas_image_loader_[]$1[]_libs=""
335
336AC_SUBST([evas_image_loader_$1_cflags])
337AC_SUBST([evas_image_loader_$1_libs])
338
339if test "x${have_dep}" = "xyes" ; then
340 m4_default([$3], [:])
341else
342 m4_default([$4], [:])
343fi
344
345])
346
347dnl use: EVAS_CHECK_LOADER_DEP_TIFF(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
348
349AC_DEFUN([EVAS_CHECK_LOADER_DEP_TIFF],
350[
351
352have_dep="no"
353evas_image_loader_[]$1[]_cflags=""
354evas_image_loader_[]$1[]_libs=""
355
356AC_CHECK_HEADER([tiffio.h], [have_dep="yes"])
357
358if test "x${have_dep}" = "xyes" ; then
359 AC_CHECK_LIB([tiff],
360 [TIFFReadScanline],
361 [
362 evas_image_loader_[]$1[]_libs="-ltiff"
363 ],
364 [have_dep="no"]
365 )
366
367 if test "x${have_dep}" = "xno" ; then
368 AC_CHECK_LIB([tiff],
369 [TIFFReadScanline],
370 [
371 have_dep="yes"
372 evas_image_loader_[]$1[]_libs="-ltiff -ljpeg -lz -lm"
373 ]
374 )
375 fi
376
377 if test "x${have_dep}" = "xno" ; then
378 AC_CHECK_LIB([tiff34],
379 [TIFFReadScanline],
380 [
381 have_dep="yes"
382 evas_image_loader_[]$1[]_libs="-ltiff34 -ljpeg -lz -lm"
383 ]
384 )
385 fi
386fi
387
388if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
389 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
390 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
391fi
392
393AC_SUBST([evas_image_loader_$1_cflags])
394AC_SUBST([evas_image_loader_$1_libs])
395
396if test "x${have_dep}" = "xyes" ; then
397 m4_default([$3], [:])
398else
399 m4_default([$4], [:])
400fi
401
402])
403
404dnl use: EVAS_CHECK_LOADER_DEP_WBMP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
405
406AC_DEFUN([EVAS_CHECK_LOADER_DEP_WBMP],
407[
408
409have_dep="yes"
410evas_image_loader_[]$1[]_cflags=""
411evas_image_loader_[]$1[]_libs=""
412
413AC_SUBST([evas_image_loader_$1_cflags])
414AC_SUBST([evas_image_loader_$1_libs])
415
416if test "x${have_dep}" = "xyes" ; then
417 m4_default([$3], [:])
418else
419 m4_default([$4], [:])
420fi
421
422])
423
424dnl use: EVAS_CHECK_LOADER_DEP_WEBP(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
425
426AC_DEFUN([EVAS_CHECK_LOADER_DEP_WEBP],
427[
428
429have_dep="no"
430evas_image_loader_[]$1[]_cflags=""
431evas_image_loader_[]$1[]_libs=""
432
433AC_CHECK_HEADER([webp/decode.h], [have_dep="yes"])
434
435if test "x${have_dep}" = "xyes" ; then
436 AC_CHECK_LIB([webp],
437 [WebPDecodeRGBA],
438 [
439 evas_image_loader_[]$1[]_libs="-lwebp"
440 ],
441 [have_dep="no"]
442 )
443fi
444
445if test "x$2" = "xstatic" && test "x${have_dep}" = "xyes" ; then
446 requirements_libs_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_evas}"
447 requirements_libs_deps_evas="${evas_image_loader_[]$1[]_libs} ${requirements_libs_deps_evas}"
448fi
449
450AC_SUBST([evas_image_loader_$1_cflags])
451AC_SUBST([evas_image_loader_$1_libs])
452
453if test "x${have_dep}" = "xyes" ; then
454 m4_default([$3], [:])
455else
456 m4_default([$4], [:])
457fi
458
459])
460
461dnl use: EVAS_CHECK_LOADER_DEP_XPM(loader, want_static[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
462
463AC_DEFUN([EVAS_CHECK_LOADER_DEP_XPM],
464[
465
466have_dep="yes"
467evas_image_loader_[]$1[]_cflags=""
468evas_image_loader_[]$1[]_libs=""
469
470AC_SUBST([evas_image_loader_$1_cflags])
471AC_SUBST([evas_image_loader_$1_libs])
472
473if test "x${have_dep}" = "xyes" ; then
474 m4_default([$3], [:])
475else
476 m4_default([$4], [:])
477fi
478
479])
480
481dnl use: EVAS_CHECK_IMAGE_LOADER(loader, want_loader, macro)
482
483
484AC_DEFUN([EVAS_CHECK_IMAGE_LOADER],
485[
486
487m4_pushdef([UP], m4_toupper([$1]))
488m4_pushdef([DOWN], m4_tolower([$1]))
489
490want_loader="$2"
491want_static_loader="no"
492have_loader="no"
493have_evas_image_loader_[]DOWN="no"
494
495AC_MSG_CHECKING([whether to enable $1 image loader])
496AC_MSG_RESULT([${want_loader}])
497
498if test "x${want_loader}" = "xyes" -o "x${want_loader}" = "xstatic" -o "x${want_loader}" = "xauto"; then
499 m4_default([EVAS_CHECK_LOADER_DEP_]m4_defn([UP]))(DOWN, ${want_loader}, [have_loader="yes"], [have_loader="no"])
500fi
501
502if test "x${have_loader}" = "xno" -a "x${want_loader}" = "xyes" -a "x${use_strict}" = "xyes" ; then
503 AC_MSG_ERROR([$1 dependencies not found (strict dependencies checking)])
504fi
505
506AC_MSG_CHECKING([whether $1 image loader will be built])
507AC_MSG_RESULT([${have_loader}])
508
509if test "x${have_loader}" = "xyes" ; then
510 if test "x${want_loader}" = "xstatic" ; then
511 have_evas_image_loader_[]DOWN="static"
512 want_static_loader="yes"
513 else
514 have_evas_image_loader_[]DOWN="yes"
515 fi
516fi
517
518if test "x${have_loader}" = "xyes" ; then
519 AC_DEFINE(BUILD_LOADER_[]UP, [1], [UP Image Loader Support])
520fi
521
522AM_CONDITIONAL(BUILD_LOADER_[]UP, [test "x${have_loader}" = "xyes"])
523
524if test "x${want_static_loader}" = "xyes" ; then
525 AC_DEFINE(EVAS_STATIC_BUILD_[]UP, [1], [Build $1 image loader inside libevas])
526 have_static_module="yes"
527fi
528
529AM_CONDITIONAL(EVAS_STATIC_BUILD_[]UP, [test "x${want_static_loader}" = "xyes"])
530
531m4_popdef([UP])
532m4_popdef([DOWN])
533
534])
diff --git a/legacy/evas/m4/evas_dither.m4 b/m4/evas_dither.m4
index f8dcca3b7b..f8dcca3b7b 100644
--- a/legacy/evas/m4/evas_dither.m4
+++ b/m4/evas_dither.m4
diff --git a/legacy/evas/ChangeLog b/old/ChangeLog.evas
index 3bc62e3d22..3bc62e3d22 100644
--- a/legacy/evas/ChangeLog
+++ b/old/ChangeLog.evas
diff --git a/legacy/evas/NEWS b/old/NEWS.evas
index 3271bbe905..3271bbe905 100644
--- a/legacy/evas/NEWS
+++ b/old/NEWS.evas
diff --git a/legacy/evas/README b/old/README.evas
index a881811c0f..a881811c0f 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 493f8cce07..493f8cce07 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 9a1bc3aba4..9a1bc3aba4 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 0e1f0a08e6..0e1f0a08e6 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 d908e0bdd1..d908e0bdd1 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 64c17b352e..64c17b352e 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 2cb1ec264e..2cb1ec264e 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 ba17d58c78..ba17d58c78 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 da5d798456..da5d798456 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 de4b6d2afc..de4b6d2afc 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 097c4e1e80..097c4e1e80 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 fb19724792..fb19724792 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 b32556c7da..b32556c7da 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 a770c42ae9..a770c42ae9 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 5576681b10..5576681b10 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 f5c514a861..6c852b5ccc 100644
--- a/legacy/evas/evas.pc.in
+++ b/pc/evas.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
5 5
6Name: evas 6Name: evas
7Description: Evas canvas display library 7Description: Evas canvas display library
8@pkgconfig_requires_private@: @requirement_evas@ 8Requires.private: @requirements_pc_evas@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -levas @EINA_LIBS@ @shm_open_libs@ 10Libs: -L${libdir} -levas
11Libs.private: @EFL_FNMATCH_LIBS@ @pthread_libs@ @shm_open_libs@ 11Libs.private: @requirements_libs_evas@
12Cflags: -I${includedir}/evas-@VMAJ@ 12Cflags: -I${includedir}/evas-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index b0fc8b5da8..930d4aebed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
2 2
3MAINTAINERCLEANFILES = Makefile.in 3MAINTAINERCLEANFILES = Makefile.in
4 4
5SUBDIRS = . scripts benchmarks tests examples 5SUBDIRS = . benchmarks tests examples
6 6
7lib_LTLIBRARIES = 7lib_LTLIBRARIES =
8bin_PROGRAMS = 8bin_PROGRAMS =
@@ -15,6 +15,7 @@ endif
15include Makefile_Eina.am 15include Makefile_Eina.am
16include Makefile_Eo.am 16include Makefile_Eo.am
17include Makefile_Eet.am 17include Makefile_Eet.am
18include Makefile_Evas.am
18include Makefile_Embryo.am 19include Makefile_Embryo.am
19 20
20.PHONY: benchmark examples 21.PHONY: benchmark examples
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 930f62f973..4f5de8420f 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -239,3 +239,7 @@ EXTRA_DIST += \
239lib/eina/eina_config.h.in \ 239lib/eina/eina_config.h.in \
240lib/eina/eina_strbuf_template_c.x \ 240lib/eina/eina_strbuf_template_c.x \
241lib/eina/eina_binbuf_template_c.x 241lib/eina/eina_binbuf_template_c.x
242
243### Script
244
245bin_SCRIPTS = scripts/eina/eina-bench-cmp
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
new file mode 100644
index 0000000000..49b8cd7ca7
--- /dev/null
+++ b/src/Makefile_Evas.am
@@ -0,0 +1,1837 @@
1
2### Library
3
4lib_LTLIBRARIES += lib/evas/libevas.la
5
6installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@
7dist_installed_evasmainheaders_DATA = lib/evas/Evas.h lib/evas/Evas_GL.h
8
9noinst_HEADERS = \
10lib/evas/include/evas_inline.x \
11lib/evas/include/evas_private.h \
12lib/evas/include/evas_options.h \
13lib/evas/include/evas_macros.h \
14lib/evas/include/evas_mmx.h \
15lib/evas/include/evas_common.h \
16lib/evas/include/evas_blend_ops.h
17
18# Linebreak
19
20noinst_HEADERS += \
21static_libs/liblinebreak/linebreak.h \
22static_libs/liblinebreak/linebreakdef.h \
23static_libs/liblinebreak/wordbreakdef.h \
24static_libs/liblinebreak/wordbreak.h
25
26# Linebreak
27lib_evas_libevas_la_SOURCES = \
28static_libs/liblinebreak/linebreak.c \
29static_libs/liblinebreak/linebreakdata.c \
30static_libs/liblinebreak/linebreakdef.c \
31static_libs/liblinebreak/wordbreak.c \
32static_libs/liblinebreak/wordbreakdata.x
33
34# Main
35lib_evas_libevas_la_SOURCES += \
36lib/evas/main.c
37
38# Canvas
39lib_evas_libevas_la_SOURCES += \
40lib/evas/canvas/common_interfaces.c \
41lib/evas/canvas/evas_callbacks.c \
42lib/evas/canvas/evas_clip.c \
43lib/evas/canvas/evas_common_interface.c \
44lib/evas/canvas/evas_data.c \
45lib/evas/canvas/evas_device.c \
46lib/evas/canvas/evas_events.c \
47lib/evas/canvas/evas_filter.c \
48lib/evas/canvas/evas_focus.c \
49lib/evas/canvas/evas_key.c \
50lib/evas/canvas/evas_key_grab.c \
51lib/evas/canvas/evas_layer.c \
52lib/evas/canvas/evas_main.c \
53lib/evas/canvas/evas_name.c \
54lib/evas/canvas/evas_object_image.c \
55lib/evas/canvas/evas_object_main.c \
56lib/evas/canvas/evas_object_inform.c \
57lib/evas/canvas/evas_object_intercept.c \
58lib/evas/canvas/evas_object_line.c \
59lib/evas/canvas/evas_object_polygon.c \
60lib/evas/canvas/evas_object_rectangle.c \
61lib/evas/canvas/evas_object_smart.c \
62lib/evas/canvas/evas_object_smart_clipped.c \
63lib/evas/canvas/evas_object_box.c \
64lib/evas/canvas/evas_object_table.c \
65lib/evas/canvas/evas_object_text.c \
66lib/evas/canvas/evas_object_textblock.c \
67lib/evas/canvas/evas_object_textgrid.c \
68lib/evas/canvas/evas_object_grid.c \
69lib/evas/canvas/evas_font_dir.c \
70lib/evas/canvas/evas_rectangle.c \
71lib/evas/canvas/evas_render.c \
72lib/evas/canvas/evas_smart.c \
73lib/evas/canvas/evas_stack.c \
74lib/evas/canvas/evas_async_events.c \
75lib/evas/canvas/evas_stats.c \
76lib/evas/canvas/evas_touch_point.c \
77lib/evas/canvas/evas_map.c \
78lib/evas/canvas/evas_gl.c
79
80# Cache
81lib_evas_libevas_la_SOURCES += \
82lib/evas/cache/evas_cache_image.c \
83lib/evas/cache/evas_cache_engine_image.c \
84lib/evas/cache/evas_preload.c \
85lib/evas/cache/evas_cache.h
86
87# Cache2 - Cserve2
88if EVAS_CSERVE2
89lib_evas_libevas_la_SOURCES += \
90lib/evas/cache2/evas_cache2.c \
91lib/evas/cache2/evas_cache2.h
92
93lib_evas_libevas_la_SOURCES += \
94lib/evas/cserve2/evas_cs2.h \
95lib/evas/cserve2/evas_cs2_private.h \
96lib/evas/cserve2/evas_cs2_image_data.c \
97lib/evas/cserve2/evas_cs2_client.c
98
99lib_evas_libevas_la_SOURCES += \
100lib/evas/cserve2/evas_cs2_utils.h \
101lib/evas/cserve2/evas_cs2_utils.c
102endif
103
104# File
105lib_evas_libevas_la_SOURCES += \
106lib/evas/file/evas_path.c \
107lib/evas/file/evas_module.c \
108lib/evas/file/evas_module.h \
109lib/evas/file/evas_path.h
110
111# Engine
112lib_evas_libevas_la_SOURCES += \
113lib/evas/common/evas_op_copy_main_.c \
114lib/evas/common/evas_op_blend_main_.c \
115lib/evas/common/evas_op_add_main_.c \
116lib/evas/common/evas_op_sub_main_.c \
117lib/evas/common/evas_op_mask_main_.c \
118lib/evas/common/evas_op_mul_main_.c \
119lib/evas/common/evas_blend_main.c \
120lib/evas/common/evas_blit_main.c \
121lib/evas/common/evas_convert_color.c \
122lib/evas/common/evas_convert_colorspace.c \
123lib/evas/common/evas_convert_gry_1.c \
124lib/evas/common/evas_convert_gry_8.c \
125lib/evas/common/evas_convert_main.c \
126lib/evas/common/evas_convert_rgb_16.c \
127lib/evas/common/evas_convert_rgb_24.c \
128lib/evas/common/evas_convert_rgb_32.c \
129lib/evas/common/evas_convert_rgb_8.c \
130lib/evas/common/evas_convert_grypal_6.c \
131lib/evas/common/evas_convert_yuv.c \
132lib/evas/common/evas_cpu.c \
133lib/evas/common/evas_draw_main.c \
134lib/evas/common/evas_font_draw.c \
135lib/evas/common/evas_font_load.c \
136lib/evas/common/evas_font_main.c \
137lib/evas/common/evas_font_query.c \
138lib/evas/common/evas_image_load.c \
139lib/evas/common/evas_image_save.c \
140lib/evas/common/evas_image_main.c \
141lib/evas/common/evas_image_data.c \
142lib/evas/common/evas_image_scalecache.c \
143lib/evas/common/evas_line_main.c \
144lib/evas/common/evas_polygon_main.c \
145lib/evas/common/evas_rectangle_main.c \
146lib/evas/common/evas_scale_main.c \
147lib/evas/common/evas_scale_sample.c \
148lib/evas/common/evas_scale_smooth.c \
149lib/evas/common/evas_scale_span.c \
150lib/evas/common/evas_tiler.c \
151lib/evas/common/evas_regionbuf.c \
152lib/evas/common/evas_pipe.c \
153lib/evas/common/language/evas_bidi_utils.c \
154lib/evas/common/language/evas_language_utils.c \
155lib/evas/common/evas_text_utils.c \
156lib/evas/common/evas_font_ot.c \
157lib/evas/common/evas_map_image.c \
158lib/evas/common/evas_map_image.h \
159lib/evas/common/evas_blend.h \
160lib/evas/common/evas_blend_private.h \
161lib/evas/common/evas_convert_color.h \
162lib/evas/common/evas_convert_colorspace.h \
163lib/evas/common/evas_convert_gry_1.h \
164lib/evas/common/evas_convert_gry_8.h \
165lib/evas/common/evas_convert_grypal_6.h \
166lib/evas/common/evas_convert_main.h \
167lib/evas/common/evas_convert_rgb_16.h \
168lib/evas/common/evas_convert_rgb_24.h \
169lib/evas/common/evas_convert_rgb_32.h \
170lib/evas/common/evas_convert_rgb_8.h \
171lib/evas/common/evas_convert_yuv.h \
172lib/evas/common/evas_draw.h \
173lib/evas/common/evas_font.h \
174lib/evas/common/evas_font_default_walk.x \
175lib/evas/common/evas_font_private.h \
176lib/evas/common/evas_image.h \
177lib/evas/common/evas_image_private.h \
178lib/evas/common/evas_line.h \
179lib/evas/common/evas_polygon.h \
180lib/evas/common/evas_rectangle.h \
181lib/evas/common/evas_scale_main.h \
182lib/evas/common/evas_scale_smooth.h \
183lib/evas/common/evas_scale_span.h \
184lib/evas/common/evas_pipe.h \
185lib/evas/common/language/evas_bidi_utils.h \
186lib/evas/common/language/evas_language_utils.h \
187lib/evas/common/language/evas_script_table.h \
188lib/evas/common/evas_text_utils.h \
189lib/evas/common/evas_font_ot.h
190
191# SSE3
192lib_evas_libevas_la_SOURCES += \
193lib/evas/common/evas_op_blend/op_blend_master_sse3.c
194
195lib_evas_libevas_la_CPPFLAGS = \
196-I$(top_srcdir)/src/lib/evas \
197-I$(top_builddir)/src/lib/evas \
198-I$(top_srcdir)/src/lib/evas/include \
199-I$(top_builddir)/src/lib/evas/include \
200-I$(top_srcdir)/src/lib/evas/cserve2 \
201-I$(top_builddir)/src/lib/evas/cserve2 \
202-I$(top_srcdir)/src/lib/evas/file \
203-I$(top_builddir)/src/lib/evas/file \
204-I$(top_srcdir)/src/static_libs/liblinebreak \
205-I$(top_builddir)/src/static_libs/liblinebreak \
206-I$(top_srcdir)/src/lib/evas/common \
207-I$(top_builddir)/src/lib/evas/common \
208-I$(top_srcdir)/src/lib/eina \
209-I$(top_srcdir)/src/lib/eo \
210-I$(top_srcdir)/src/lib/eet \
211-I$(top_builddir)/src/lib/eina \
212-I$(top_builddir)/src/lib/eo \
213-I$(top_builddir)/src/lib/eet \
214-DPACKAGE_BIN_DIR=\"$(bindir)\" \
215-DPACKAGE_LIB_DIR=\"$(libdir)\" \
216-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
217@EFL_CFLAGS@ \
218@EVAS_CFLAGS@ \
219@VALGRIND_CFLAGS@ \
220@EVAS_ALTIVEC_CFLAGS@ \
221@EVAS_SSE3_CFLAGS@
222
223if HAVE_WINDOWS
224lib_evas_libevas_la_CPPFLAGS += \
225-I$(top_srcdir)/src/lib/evil \
226-I$(top_builddir)/src/lib/evil
227endif
228
229lib_evas_libevas_la_CXXFLAGS =
230
231lib_evas_libevas_la_LIBADD = \
232lib/eina/libeina.la \
233lib/eet/libeet.la \
234lib/eo/libeo.la \
235@EVAS_LIBS@ \
236-lm
237
238lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
239
240# Linebreak
241
242EXTRA_DIST += \
243static_libs/liblinebreak/LineBreak1.sed \
244static_libs/liblinebreak/LineBreak2.sed \
245static_libs/liblinebreak/linebreakdata1.tmpl \
246static_libs/liblinebreak/linebreakdata2.tmpl \
247static_libs/liblinebreak/linebreakdata3.tmpl \
248static_libs/liblinebreak/LICENCE
249
250# Engines
251
252EXTRA_DIST += \
253lib/evas/common/evas_map_image_internal.c \
254lib/evas/common/evas_map_image_core.c \
255lib/evas/common/evas_map_image_loop.c \
256lib/evas/common/evas_scale_smooth_scaler.c \
257lib/evas/common/evas_scale_smooth_scaler_down.c \
258lib/evas/common/evas_scale_smooth_scaler_downx.c \
259lib/evas/common/evas_scale_smooth_scaler_downx_downy.c \
260lib/evas/common/evas_scale_smooth_scaler_downy.c \
261lib/evas/common/evas_scale_smooth_scaler_noscale.c \
262lib/evas/common/evas_scale_smooth_scaler_up.c
263
264# evas_op_add
265
266EXTRA_DIST += \
267lib/evas/common/evas_op_add/op_add_color_.c \
268lib/evas/common/evas_op_add/op_add_color_i386.c \
269lib/evas/common/evas_op_add/op_add_mask_color_.c \
270lib/evas/common/evas_op_add/op_add_mask_color_i386.c \
271lib/evas/common/evas_op_add/op_add_pixel_.c \
272lib/evas/common/evas_op_add/op_add_pixel_color_.c \
273lib/evas/common/evas_op_add/op_add_pixel_color_i386.c \
274lib/evas/common/evas_op_add/op_add_pixel_i386.c \
275lib/evas/common/evas_op_add/op_add_pixel_mask_.c \
276lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c
277
278# evas_op_blend
279
280EXTRA_DIST += \
281lib/evas/common/evas_op_blend/op_blend_color_.c \
282lib/evas/common/evas_op_blend/op_blend_color_i386.c \
283lib/evas/common/evas_op_blend/op_blend_color_neon.c \
284lib/evas/common/evas_op_blend/op_blend_color_sse3.c \
285lib/evas/common/evas_op_blend/op_blend_mask_color_.c \
286lib/evas/common/evas_op_blend/op_blend_mask_color_i386.c \
287lib/evas/common/evas_op_blend/op_blend_mask_color_neon.c \
288lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c \
289lib/evas/common/evas_op_blend/op_blend_pixel_.c \
290lib/evas/common/evas_op_blend/op_blend_pixel_color_.c \
291lib/evas/common/evas_op_blend/op_blend_pixel_color_i386.c \
292lib/evas/common/evas_op_blend/op_blend_pixel_color_neon.c \
293lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c \
294lib/evas/common/evas_op_blend/op_blend_pixel_i386.c \
295lib/evas/common/evas_op_blend/op_blend_pixel_mask_.c \
296lib/evas/common/evas_op_blend/op_blend_pixel_mask_i386.c \
297lib/evas/common/evas_op_blend/op_blend_pixel_mask_neon.c \
298lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c \
299lib/evas/common/evas_op_blend/op_blend_pixel_neon.c \
300lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
301
302# evas_op_copy
303
304EXTRA_DIST += \
305lib/evas/common/evas_op_copy/op_copy_color_.c \
306lib/evas/common/evas_op_copy/op_copy_color_i386.c \
307lib/evas/common/evas_op_copy/op_copy_color_neon.c \
308lib/evas/common/evas_op_copy/op_copy_mask_color_.c \
309lib/evas/common/evas_op_copy/op_copy_mask_color_i386.c \
310lib/evas/common/evas_op_copy/op_copy_mask_color_neon.c \
311lib/evas/common/evas_op_copy/op_copy_pixel_.c \
312lib/evas/common/evas_op_copy/op_copy_pixel_neon.c \
313lib/evas/common/evas_op_copy/op_copy_pixel_color_.c \
314lib/evas/common/evas_op_copy/op_copy_pixel_color_i386.c \
315lib/evas/common/evas_op_copy/op_copy_pixel_color_neon.c \
316lib/evas/common/evas_op_copy/op_copy_pixel_i386.c \
317lib/evas/common/evas_op_copy/op_copy_pixel_mask_.c \
318lib/evas/common/evas_op_copy/op_copy_pixel_mask_i386.c \
319lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c
320
321# evas_op_mask
322
323EXTRA_DIST += \
324lib/evas/common/evas_op_mask/op_mask_color_.c \
325lib/evas/common/evas_op_mask/op_mask_color_i386.c \
326lib/evas/common/evas_op_mask/op_mask_mask_color_.c \
327lib/evas/common/evas_op_mask/op_mask_mask_color_i386.c \
328lib/evas/common/evas_op_mask/op_mask_pixel_.c \
329lib/evas/common/evas_op_mask/op_mask_pixel_color_.c \
330lib/evas/common/evas_op_mask/op_mask_pixel_color_i386.c \
331lib/evas/common/evas_op_mask/op_mask_pixel_i386.c \
332lib/evas/common/evas_op_mask/op_mask_pixel_mask_.c \
333lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c
334
335# evas_op_mul
336
337EXTRA_DIST += \
338lib/evas/common/evas_op_mul/op_mul_color_.c \
339lib/evas/common/evas_op_mul/op_mul_color_i386.c \
340lib/evas/common/evas_op_mul/op_mul_mask_color_.c \
341lib/evas/common/evas_op_mul/op_mul_mask_color_i386.c \
342lib/evas/common/evas_op_mul/op_mul_pixel_.c \
343lib/evas/common/evas_op_mul/op_mul_pixel_color_.c \
344lib/evas/common/evas_op_mul/op_mul_pixel_color_i386.c \
345lib/evas/common/evas_op_mul/op_mul_pixel_i386.c \
346lib/evas/common/evas_op_mul/op_mul_pixel_mask_.c \
347lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c
348
349# evas_op_sub
350
351EXTRA_DIST += \
352lib/evas/common/evas_op_sub/op_sub_color_.c \
353lib/evas/common/evas_op_sub/op_sub_color_i386.c \
354lib/evas/common/evas_op_sub/op_sub_mask_color_.c \
355lib/evas/common/evas_op_sub/op_sub_mask_color_i386.c \
356lib/evas/common/evas_op_sub/op_sub_pixel_.c \
357lib/evas/common/evas_op_sub/op_sub_pixel_color_.c \
358lib/evas/common/evas_op_sub/op_sub_pixel_color_i386.c \
359lib/evas/common/evas_op_sub/op_sub_pixel_i386.c \
360lib/evas/common/evas_op_sub/op_sub_pixel_mask_.c \
361lib/evas/common/evas_op_sub/op_sub_pixel_mask_i386.c
362
363
364### Engines
365
366if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
367lib_evas_libevas_la_SOURCES += modules/evas/engines/software_generic/evas_engine.c
368lib_evas_libevas_la_LIBADD +=
369else
370enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
371enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
372modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
373modules_evas_engines_software_generic_module_la_CPPFLAGS = \
374-I$(top_srcdir)/src/lib/eina \
375-I$(top_srcdir)/src/lib/eo \
376-I$(top_srcdir)/src/lib/evas \
377-I$(top_srcdir)/src/lib/evas/include \
378-I$(top_srcdir)/src/lib/evas/cserve2 \
379@EFL_CFLAGS@ \
380@EVAS_CFLAGS@
381modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la
382modules_evas_engines_software_generic_module_la_LDFLAGS = -no-undefined -module -avoid-version
383modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
384endif
385
386if BUILD_ENGINE_BUFFER
387dist_installed_evasmainheaders_DATA += modules/evas/engines/buffer/Evas_Engine_Buffer.h
388BUFFER_SOURCES = \
389modules/evas/engines/buffer/evas_engine.c \
390modules/evas/engines/buffer/evas_outbuf.c \
391modules/evas/engines/buffer/evas_engine.h
392if EVAS_STATIC_BUILD_BUFFER
393lib_evas_libevas_la_SOURCES += $(BUFFER_SOURCES)
394else
395enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
396enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
397modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
398modules_evas_engines_buffer_module_la_CPPFLAGS = \
399-I$(top_srcdir)/src/lib/eina \
400-I$(top_srcdir)/src/lib/eo \
401-I$(top_srcdir)/src/lib/evas \
402-I$(top_srcdir)/src/lib/evas/include \
403-I$(top_srcdir)/src/lib/evas/cserve2 \
404@EFL_CFLAGS@ \
405@EVAS_CFLAGS@
406modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
407modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
408modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
409endif
410endif
411
412if BUILD_ENGINE_DIRECT3D
413dist_installed_evasmainheaders_DATA += modules/evas/engines/direct3d/Evas_Engine_Direct3D.h
414DIRECT3D_SOURCES = \
415modules/evas/engines/direct3d/evas_engine.c \
416modules/evas/engines/direct3d/evas_direct3d_context.cpp \
417modules/evas/engines/direct3d/evas_direct3d_device.cpp \
418modules/evas/engines/direct3d/evas_direct3d_image_cache.cpp \
419modules/evas/engines/direct3d/evas_direct3d_main.cpp \
420modules/evas/engines/direct3d/evas_direct3d_object.cpp \
421modules/evas/engines/direct3d/evas_direct3d_object_font.cpp \
422modules/evas/engines/direct3d/evas_direct3d_object_image.cpp \
423modules/evas/engines/direct3d/evas_direct3d_object_line.cpp \
424modules/evas/engines/direct3d/evas_direct3d_object_rect.cpp \
425modules/evas/engines/direct3d/evas_direct3d_scene.cpp \
426modules/evas/engines/direct3d/evas_direct3d_shader_pack.cpp \
427modules/evas/engines/direct3d/evas_direct3d_vertex_buffer_cache.cpp \
428modules/evas/engines/direct3d/array.h \