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.
This commit is contained in:
Stefan Schmidt 2016-06-21 17:01:16 +02:00
parent fffe6dc7b8
commit 24ee3e4d12
20 changed files with 41 additions and 3 deletions

View File

@ -14,6 +14,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -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 <Eo.h>
#include <Evas.h>

View File

@ -18,6 +18,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -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 <Ecore.h>
#include <Ecore_Evas.h>

View File

@ -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 <Eo.h>
#include <Evas.h>

View File

@ -12,6 +12,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -18,6 +18,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -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 <math.h>
#include <Eo.h>

View File

@ -19,6 +19,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Ecore.h>

View File

@ -16,6 +16,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -11,6 +11,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -15,6 +15,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -18,6 +18,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -13,6 +13,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -15,6 +15,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <math.h>

View File

@ -16,6 +16,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -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 <math.h>
#include <Ecore.h>

View File

@ -28,6 +28,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -15,6 +15,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <Eo.h>

View File

@ -5,6 +5,7 @@
#else
#define PACKAGE_EXAMPLES_DIR "."
#define EFL_BETA_API_SUPPORT
#define EFL_EO_API_SUPPORT
#endif
#include <stdio.h>