From 24ee3e4d12e85555be3ba5656c80f69e302f20be Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 21 Jun 2016 17:01:16 +0200 Subject: [PATCH] examples: evas3d: uniform use of config.h include or manual defines My recent removal of the EFL_EO_API_SUPPORT define brought some trouble to the evas 3d examples. The problem was that there was no uniform usage of including config.h and thus it worked fine in some constellations abut not in others. This patch should fix the known problems and brings back EFL_EO_API_SUPPORT until we are removing it from the whole code base. --- src/examples/evas/evas-3d-aabb.c | 1 + src/examples/evas/evas-3d-blending.c | 6 ++++++ src/examples/evas/evas-3d-colorpick.c | 1 + src/examples/evas/evas-3d-cube-rotate.c | 5 +++++ src/examples/evas/evas-3d-cube.c | 6 +++++- src/examples/evas/evas-3d-cube2.c | 1 + src/examples/evas/evas-3d-eet.c | 1 + src/examples/evas/evas-3d-fog.c | 6 +++++- 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 | 6 +++++- src/examples/evas/evas-3d-shadows.c | 1 + src/examples/evas/evas-3d-static-lod.c | 1 + src/examples/evas/shooter/evas-3d-shooter-header.h | 1 + 20 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c index 96b80b25c8..cd2509f274 100644 --- a/src/examples/evas/evas-3d-aabb.c +++ b/src/examples/evas/evas-3d-aabb.c @@ -14,6 +14,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c index 132d57f516..51dff5a1c6 100644 --- a/src/examples/evas/evas-3d-blending.c +++ b/src/examples/evas/evas-3d-blending.c @@ -8,7 +8,13 @@ * @endverbatim */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#else #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT +#endif #include #include diff --git a/src/examples/evas/evas-3d-colorpick.c b/src/examples/evas/evas-3d-colorpick.c index 7cca509b4c..3d79500a91 100644 --- a/src/examples/evas/evas-3d-colorpick.c +++ b/src/examples/evas/evas-3d-colorpick.c @@ -18,6 +18,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-cube-rotate.c b/src/examples/evas/evas-3d-cube-rotate.c index bbd64e677a..6ed1ad5c77 100644 --- a/src/examples/evas/evas-3d-cube-rotate.c +++ b/src/examples/evas/evas-3d-cube-rotate.c @@ -12,7 +12,12 @@ * @endverbatim */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#else #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT +#endif #include #include diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index 599467e81f..9bb15cef3c 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -8,8 +8,12 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT +#ifdef HAVE_CONFIG_H +#include "config.h" +#else #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT +#endif #include #include diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index c05e80f61f..07daf1906f 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -12,6 +12,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index f0fed074c6..4e75aa9ffe 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -18,6 +18,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index a937c45d37..97bb6e2a1c 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -6,8 +6,12 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT +#ifdef HAVE_CONFIG_H +#include "config.h" +#else #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT +#endif #include #include diff --git a/src/examples/evas/evas-3d-frustum.c b/src/examples/evas/evas-3d-frustum.c index ce81a1e940..5cdf2e4897 100644 --- a/src/examples/evas/evas-3d-frustum.c +++ b/src/examples/evas/evas-3d-frustum.c @@ -19,6 +19,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index fa3b5eaee3..5a3bc5ffbf 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -16,6 +16,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index 4e2aa04eff..1d788f9c37 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -11,6 +11,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 466b01bc9b..bd3e7991b7 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -15,6 +15,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index e1f6510de8..64dc6fd8a8 100644 --- a/src/examples/evas/evas-3d-obj.c +++ b/src/examples/evas/evas-3d-obj.c @@ -18,6 +18,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c b/src/examples/evas/evas-3d-parallax-occlusion.c index 3698cc58b0..af84f53078 100644 --- a/src/examples/evas/evas-3d-parallax-occlusion.c +++ b/src/examples/evas/evas-3d-parallax-occlusion.c @@ -13,6 +13,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c index eef2bd22d8..ad8754cfe7 100644 --- a/src/examples/evas/evas-3d-pick.c +++ b/src/examples/evas/evas-3d-pick.c @@ -15,6 +15,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c index 32ac344e74..b4a09621b8 100644 --- a/src/examples/evas/evas-3d-ply.c +++ b/src/examples/evas/evas-3d-ply.c @@ -16,6 +16,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c index b4d5d75b1b..6a16bec0dc 100644 --- a/src/examples/evas/evas-3d-proxy.c +++ b/src/examples/evas/evas-3d-proxy.c @@ -8,8 +8,12 @@ * @endverbatim */ -#define EFL_EO_API_SUPPORT +#ifdef HAVE_CONFIG_H +#include "config.h" +#else #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT +#endif #include #include diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c index e7782f0d6c..e7eeb1de98 100644 --- a/src/examples/evas/evas-3d-shadows.c +++ b/src/examples/evas/evas-3d-shadows.c @@ -28,6 +28,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/evas-3d-static-lod.c b/src/examples/evas/evas-3d-static-lod.c index e20fa58cef..a4023c258e 100644 --- a/src/examples/evas/evas-3d-static-lod.c +++ b/src/examples/evas/evas-3d-static-lod.c @@ -15,6 +15,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include diff --git a/src/examples/evas/shooter/evas-3d-shooter-header.h b/src/examples/evas/shooter/evas-3d-shooter-header.h index aaa6ff389c..13600ec121 100644 --- a/src/examples/evas/shooter/evas-3d-shooter-header.h +++ b/src/examples/evas/shooter/evas-3d-shooter-header.h @@ -5,6 +5,7 @@ #else #define PACKAGE_EXAMPLES_DIR "." #define EFL_BETA_API_SUPPORT +#define EFL_EO_API_SUPPORT #endif #include