From 2dabd04dc85fa8486e93a54758b0dafc7905dfa2 Mon Sep 17 00:00:00 2001 From: Christophe Sadoine Date: Tue, 25 Jun 2013 12:27:45 +0900 Subject: [PATCH] evas: fix problem with dllimport on Windows. Signed-off-by: Cedric Bail --- src/lib/evas/Evas_Eo.h | 16 ++++++++++++++++ src/lib/evas/canvas/evas_callbacks.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 9a2fa92..6ea3298 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -1,5 +1,21 @@ #include +#ifdef _WIN32 +# ifdef EAPI +# undef EAPI +# endif +# ifdef EFL_EVAS_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI +# endif /* ! EFL_EVAS_BUILD */ +#else +#endif /* ! _WIN32 */ + EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN; EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT; EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN; diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 8dbdfe8..9e1e3a8 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -1,6 +1,22 @@ #include "evas_common_private.h" #include "evas_private.h" +#ifdef _WIN32 +# ifdef EAPI +# undef EAPI +# endif +# ifdef EFL_EVAS_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ +# else +# define EAPI +# endif /* ! EFL_EVAS_BUILD */ +#else +#endif /* ! _WIN32 */ + int _evas_event_counter = 0; EVAS_MEMPOOL(_mp_pc); -- 2.7.4