diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2017-08-15 16:42:13 +0200 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-08-15 14:13:25 -0700 |
| commit | dee65b525c387f482e0f860f87a1b3e110e3f0e3 (patch) | |
| tree | 4fe5cadf20b30659ab68c3ecaa0750102837b0ec | |
| parent | f4f926f2bd69865e538d8b5259e350674562d471 (diff) | |
| download | efl-dee65b525c387f482e0f860f87a1b3e110e3f0e3.tar.gz | |
ector: fix EAPI on Windows
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
| -rw-r--r-- | src/lib/ector/Ector.h | 3 | ||||
| -rw-r--r-- | src/lib/ector/cairo/Ector_Cairo.h | 29 | ||||
| -rw-r--r-- | src/lib/ector/gl/Ector_GL.h | 29 | ||||
| -rw-r--r-- | src/lib/ector/software/Ector_Software.h | 29 |
4 files changed, 90 insertions, 0 deletions
diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h index 2f479e131e..ba0efb7d89 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 b0c605855d..b0f0f95a4a 100644 --- a/src/lib/ector/cairo/Ector_Cairo.h +++ b/src/lib/ector/cairo/Ector_Cairo.h @@ -3,6 +3,32 @@ #include <Ector.h> +#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 df6ece47b7..d382ac25c3 100644 --- a/src/lib/ector/gl/Ector_GL.h +++ b/src/lib/ector/gl/Ector_GL.h @@ -3,6 +3,32 @@ #include <Ector.h> +#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 7c94b895cf..1a43a2955f 100644 --- a/src/lib/ector/software/Ector_Software.h +++ b/src/lib/ector/software/Ector_Software.h @@ -3,6 +3,32 @@ #include <Ector.h> +#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 |