From 7eab0e16037a5e3a0979cfb02f707e051540a081 Mon Sep 17 00:00:00 2001 From: "se.osadchy" Date: Wed, 15 Apr 2015 12:16:48 +0200 Subject: [PATCH] evas: fix compilation in the Evas 3D examples. Summary: Fix compilation line. Reviewers: Hermet, raster, cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2340 Signed-off-by: Cedric BAIL --- src/examples/evas/evas-3d-blending.c | 2 +- src/examples/evas/evas-3d-cube.c | 2 +- src/examples/evas/evas-3d-cube2.c | 2 +- src/examples/evas/evas-3d-fog.c | 16 ++++++++-------- src/examples/evas/evas-3d-mmap-set.c | 2 +- src/examples/evas/evas-3d-pick.c | 2 +- src/examples/evas/evas-3d-proxy.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c index 2176fde..b40be0c 100644 --- a/src/examples/evas/evas-3d-blending.c +++ b/src/examples/evas/evas-3d-blending.c @@ -4,7 +4,7 @@ * For more detailes see https://www.opengl.org/sdk/docs/man2/xhtml/glBlendFunc.xml * * @verbatim - * gcc -o evas-3d-blending evas-3d-blending.c evas-3d-primitives.c `pkg-config --libs --cflags evas ecore ecore-evas eo`-lm + * gcc -o evas-3d-blending evas-3d-blending.c evas-3d-primitives.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo`-lm * @endverbatim */ diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index 14a5ec8..02067c2 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -4,7 +4,7 @@ * This example is the best to start introduction to usage of Evas-3D. * * @verbatim - * gcc -o evas-3d-cube evas-3d-cube.c `pkg-config --libs --cflags evas ecore ecore-evas eo` + * gcc -o evas-3d-cube evas-3d-cube.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` * @endverbatim */ diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index aff4fdb..2facb04 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -3,7 +3,7 @@ * by interpolation between frames. * * @verbatim - * gcc -o evas-3d-cube2 evas-3d-cube2.c evas-3d-primitives.c `pkg-config --libs --cflags evas ecore ecore-evas eo` -lm + * gcc -o evas-3d-cube2 evas-3d-cube2.c evas-3d-primitives.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` -lm * @endverbatim */ diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index fb93ad5..df70644 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -2,7 +2,7 @@ * Example illustrating usage of fog effect. * * @verbatim - * gcc -o evas-3d-fog evas-3d-fog.c evas-3d-primitives.c `pkg-config --libs --cflags evas ecore ecore-evas eo`-lm + * gcc -o evas-3d-fog evas-3d-fog.c evas-3d-primitives.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo`-lm * @endverbatim */ @@ -61,8 +61,8 @@ _on_canvas_resize(Ecore_Evas *ee) ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); evas_object_resize(background, w, h); - eo_do(background, evas_obj_size_set(w, h)); - eo_do(image, evas_obj_size_set(w, h)); + eo_do(background, efl_gfx_size_set(w, h)); + eo_do(image, efl_gfx_size_set(w, h)); } static Eina_Bool @@ -225,16 +225,16 @@ main(void) /* Add a background rectangle objects. */ background = eo_add(EVAS_RECTANGLE_CLASS, evas); eo_do(background, - evas_obj_color_set(0, 0, 0, 255), - evas_obj_size_set(WIDTH, HEIGHT), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_size_set(WIDTH, HEIGHT), + efl_gfx_visible_set(EINA_TRUE)); /* Add an image object for 3D scene rendering. */ image = evas_object_image_filled_add(evas); eo_do(image, - evas_obj_size_set(WIDTH, HEIGHT), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(WIDTH, HEIGHT), + efl_gfx_visible_set(EINA_TRUE)); /* Set the image object as render target for 3D scene. */ eo_do(image, evas_obj_image_scene_set(data.scene)); diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index ea93081..5c50e81 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -6,7 +6,7 @@ * Show the results. * * @verbatim - * gcc -o evas-3d-mmap-set evas-3d-mmap-set.c `pkg-config --libs --cflags evas ecore ecore-evas eina eo` -lm + * gcc -o evas-3d-mmap-set evas-3d-mmap-set.c `pkg-config --libs --cflags efl evas ecore ecore-evas eina eo` -lm * @endverbatim */ diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index 49eda2c..16b380c 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -6,7 +6,7 @@ * and parameters which can be got from this function. * * @verbatim - * gcc -o evas-3d-pick evas-3d-pick.c evas-3d-primitives.c `pkg-config --libs --cflags evas ecore ecore-evas eo` -lm + * gcc -o evas-3d-pick evas-3d-pick.c evas-3d-primitives.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` -lm * @endverbatim */ diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index 71ef979..b0692f2 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -4,7 +4,7 @@ * Data which will be used as texture can be generated directly in application. * * @verbatim - * gcc -o evas-3d-proxy evas-3d-proxy.c evas-3d-primitives.c `pkg-config --libs --cflags evas ecore ecore-evas eo` -lm + * gcc -o evas-3d-proxy evas-3d-proxy.c evas-3d-primitives.c `pkg-config --libs --cflags efl evas ecore ecore-evas eo` -lm * @endverbatim */ -- 2.7.4