From d6dd63f76200f748af62e164b6831157ff44c1b7 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 14 Jun 2016 16:39:03 +0200 Subject: [PATCH] examples: remove now longer needed EFL_EO_API_SUPPORT define in canvas3d and vg These examples already had the BETA flag defined so we just need to remove the EO_API one. --- src/examples/elementary/evas3d_map_example.c | 1 - src/examples/elementary/evas3d_object_on_button_example.c | 1 - src/examples/elementary/evas3d_scene_on_button_example.c | 1 - src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c | 1 - src/examples/evas/evas-3d-aabb.c | 1 - src/examples/evas/evas-3d-blending.c | 1 - src/examples/evas/evas-3d-colorpick.c | 1 - src/examples/evas/evas-3d-cube-rotate.c | 1 - src/examples/evas/evas-3d-cube.c | 1 - src/examples/evas/evas-3d-cube2.c | 1 - src/examples/evas/evas-3d-eet.c | 1 - src/examples/evas/evas-3d-fog.c | 1 - src/examples/evas/evas-3d-frustum.c | 1 - src/examples/evas/evas-3d-hull.c | 1 - src/examples/evas/evas-3d-md2.c | 1 - src/examples/evas/evas-3d-mmap-set.c | 1 - src/examples/evas/evas-3d-obj.c | 1 - src/examples/evas/evas-3d-parallax-occlusion.c | 1 - src/examples/evas/evas-3d-pick.c | 1 - src/examples/evas/evas-3d-ply.c | 1 - src/examples/evas/evas-3d-proxy.c | 1 - src/examples/evas/evas-3d-shadows.c | 1 - src/examples/evas/evas-3d-static-lod.c | 1 - src/examples/evas/evas-vg-simple.c | 4 ---- src/examples/evas/shooter/evas-3d-shooter-header.h | 1 - 25 files changed, 28 deletions(-) diff --git a/src/examples/elementary/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c index 9393a09954..0ce96ed4ff 100644 --- a/src/examples/elementary/evas3d_map_example.c +++ b/src/examples/elementary/evas3d_map_example.c @@ -1,4 +1,3 @@ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/elementary/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c index 92c7a64cfe..dc40bb5cf4 100644 --- a/src/examples/elementary/evas3d_object_on_button_example.c +++ b/src/examples/elementary/evas3d_object_on_button_example.c @@ -7,7 +7,6 @@ */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/elementary/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c index 710114a2ea..57e8a7f6a8 100644 --- a/src/examples/elementary/evas3d_scene_on_button_example.c +++ b/src/examples/elementary/evas3d_scene_on_button_example.c @@ -6,7 +6,6 @@ * gcc -o evas3d_scene_on_button_example evas3d_scene_on_button_example.c -g `pkg-config --libs --cflags evas ecore eo elementary` */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #define WIDTH 500 diff --git a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c index 917ce6abf1..cb829a3e25 100644 --- a/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c +++ b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c @@ -15,7 +15,6 @@ * gcc -o evas_3d_sphere_hunter evas_3d_sphere_hunter.c -g `pkg-config --libs --cflags evas ecore elementary eina eo` -lm */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index cc44d2295d..96b80b25c8 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -13,7 +13,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c index 8348e22796..132d57f516 100644 --- a/src/examples/evas/evas-3d-blending.c +++ b/src/examples/evas/evas-3d-blending.c @@ -8,7 +8,6 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c index dd3e4c8cff..7cca509b4c 100644 --- a/src/examples/evas/evas-3d-colorpick.c +++ b/src/examples/evas/evas-3d-colorpick.c @@ -17,7 +17,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c index 1d8338a207..100910bea0 100644 --- a/src/examples/evas/evas-3d-cube-rotate.c +++ b/src/examples/evas/evas-3d-cube-rotate.c @@ -12,7 +12,6 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index 599467e81f..0608921c97 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -8,7 +8,6 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index b66104452f..c05e80f61f 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -11,7 +11,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index 88cf3e4fe7..f0fed074c6 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -17,7 +17,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index a937c45d37..6d5adadb46 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -6,7 +6,6 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index e642806094..ce81a1e940 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -18,7 +18,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index 208c8c0e1e..fa3b5eaee3 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -15,7 +15,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 11c549ec0b..4e2aa04eff 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -10,7 +10,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 8de7012ab4..466b01bc9b 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -14,7 +14,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index 268cc9a7eb..e1f6510de8 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -17,7 +17,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index baee68cbe2..3698cc58b0 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -12,7 +12,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index 9eb44073f4..eef2bd22d8 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -14,7 +14,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c index 552f3dacfe..32ac344e74 100644 --- a/src/examples/evas/evas-3d-ply.c +++ b/src/examples/evas/evas-3d-ply.c @@ -15,7 +15,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index b4d5d75b1b..0516a1b810 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -8,7 +8,6 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #include diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index 4f348392c2..67b0221229 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -27,7 +27,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c index a606fdda1c..e20fa58cef 100644 --- a/src/examples/evas/evas-3d-static-lod.c +++ b/src/examples/evas/evas-3d-static-lod.c @@ -14,7 +14,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index 305df03e4d..487cfd63aa 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -22,10 +22,6 @@ #define EFL_BETA_API_SUPPORT 1 #endif -#ifndef EFL_EO_API_SUPPORT -#define EFL_EO_API_SUPPORT 1 -#endif - #include #include #include diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.h b/src/examples/evas/shooter/evas-3d-shooter-header.h index 1a84f07f75..aaa6ff389c 100644 --- a/src/examples/evas/shooter/evas-3d-shooter-header.h +++ b/src/examples/evas/shooter/evas-3d-shooter-header.h @@ -4,7 +4,6 @@ #include "config.h" #else #define PACKAGE_EXAMPLES_DIR "." -#define EFL_EO_API_SUPPORT #define EFL_BETA_API_SUPPORT #endif