From 195e14c91923f309cbe7da1e458d4dc614109f42 Mon Sep 17 00:00:00 2001 From: Subhransu Mohanty Date: Wed, 8 Jul 2015 11:19:48 +0900 Subject: [PATCH] evas/ector: build fix after ector migration Change-Id: I45dcf5265af8ceee5e43653c4c90b8e483cd3b8f --- src/Makefile.am | 2 +- src/Makefile_Evas_Cxx.am | 15 +++++++-------- src/lib/evas/Evas_Eo.h | 5 ----- .../software_generic/ector_cairo_software_surface.eo | 3 --- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7cdfd61..1d32082 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,6 +34,7 @@ include Makefile_Eo.am include Makefile_Efl.am include Makefile_Eet.am include Makefile_Eolian.am +include Makefile_Ector.am include Makefile_Ecore.am include Makefile_Ecore_Con.am include Makefile_Ecore_Ipc.am @@ -63,7 +64,6 @@ include Makefile_Ecore_IMF_Evas.am include Makefile_Ecore_Evas.am include Makefile_Ecore_Buffer.am include Makefile_EPhysics.am -include Makefile_Ector.am include Makefile_Edje.am include Makefile_Emotion.am include Makefile_Ethumb.am diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am index 1a9683d..96d5ab1 100644 --- a/src/Makefile_Evas_Cxx.am +++ b/src/Makefile_Evas_Cxx.am @@ -35,14 +35,13 @@ lib/evas/canvas/evas_3d_object.eo.hh \ lib/evas/canvas/evas_3d_scene.eo.hh \ lib/evas/canvas/evas_3d_texture.eo.hh \ lib/evas/canvas/evas_vg.eo.hh \ -lib/evas/canvas/evas_vg_node.eo.hh \ -lib/evas/canvas/evas_vg_container.eo.hh \ -lib/evas/canvas/evas_vg_shape.eo.hh \ -lib/evas/canvas/evas_vg_root_node.eo.hh \ -lib/evas/canvas/evas_vg_gradient.eo.hh \ -lib/evas/canvas/evas_vg_gradient_radial.eo.hh \ -lib/evas/canvas/evas_vg_gradient_linear.eo.hh \ -lib/evas/canvas/evas_vg_image.eo.hh +lib/evas/canvas/efl_vg_base.eo.hh \ +lib/evas/canvas/efl_vg_container.eo.hh \ +lib/evas/canvas/efl_vg_shape.eo.hh \ +lib/evas/canvas/efl_vg_root_node.eo.hh \ +lib/evas/canvas/efl_vg_gradient.eo.hh \ +lib/evas/canvas/efl_vg_gradient_radial.eo.hh \ +lib/evas/canvas/efl_vg_gradient_linear.eo.hh lib/evas/Evas.hh: $(generated_evas_canvas_cxx_bindings) @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 9691946..0863b30 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -812,11 +812,6 @@ typedef enum _Evas_3D_Material_Attrib #include "canvas/evas_3d_object.eo.h" /** - * Type of abstract VG node - */ -typedef Eo Evas_VG_Node; - -/** * @ingroup Evas_Object_VG * * @{ diff --git a/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo index 9387f31..d5070ab 100644 --- a/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo +++ b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo @@ -15,7 +15,4 @@ class Ector.Cairo_Software.Surface (Ector.Cairo.Surface) } } } - implements { - Eo.Base.finalize; - } } -- 2.7.4