From dee65b525c387f482e0f860f87a1b3e110e3f0e3 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 15 Aug 2017 16:42:13 +0200 Subject: [PATCH] ector: fix EAPI on Windows Signed-off-by: Cedric BAIL --- src/lib/ector/Ector.h | 3 +++ src/lib/ector/cairo/Ector_Cairo.h | 29 +++++++++++++++++++++++++++++ src/lib/ector/gl/Ector_GL.h | 29 +++++++++++++++++++++++++++++ src/lib/ector/software/Ector_Software.h | 29 +++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+) diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h index 2f479e1..ba0efb7 100644 --- a/src/lib/ector/Ector.h +++ b/src/lib/ector/Ector.h @@ -185,4 +185,7 @@ EAPI Eina_Bool ector_glsym_set(void *(*glsym)(void *lib, const char *name), void } #endif +#undef EAPI +#define EAPI + #endif diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h index b0c6058..b0f0f95 100644 --- a/src/lib/ector/cairo/Ector_Cairo.h +++ b/src/lib/ector/cairo/Ector_Cairo.h @@ -3,6 +3,32 @@ #include +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_ECTOR_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EO_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif /* ! _WIN32 */ + #ifdef EFL_BETA_API_SUPPORT #ifndef _ECTOR_CAIRO_SURFACE_EO_CLASS_TYPE @@ -23,4 +49,7 @@ typedef struct _cairo_t cairo_t; #endif +#undef EAPI +#define EAPI + #endif diff --git a/src/lib/ector/gl/Ector_GL.h b/src/lib/ector/gl/Ector_GL.h index df6ece4..d382ac2 100644 --- a/src/lib/ector/gl/Ector_GL.h +++ b/src/lib/ector/gl/Ector_GL.h @@ -3,6 +3,32 @@ #include +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_ECTOR_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EO_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif /* ! _WIN32 */ + #ifdef EFL_BETA_API_SUPPORT #ifndef _ECTOR_GL_SURFACE_EO_CLASS_TYPE @@ -24,4 +50,7 @@ typedef short GLshort; #endif +#undef EAPI +#define EAPI + #endif diff --git a/src/lib/ector/software/Ector_Software.h b/src/lib/ector/software/Ector_Software.h index 7c94b89..1a43a29 100644 --- a/src/lib/ector/software/Ector_Software.h +++ b/src/lib/ector/software/Ector_Software.h @@ -3,6 +3,32 @@ #include +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_ECTOR_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI __declspec(dllimport) +# endif /* ! EFL_EO_BUILD */ +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif /* ! _WIN32 */ + #ifdef EFL_BETA_API_SUPPORT #include "software/ector_software_surface.eo.h" @@ -15,4 +41,7 @@ #endif +#undef EAPI +#define EAPI + #endif -- 2.7.4