summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Sadoine <chris@indefini.org>2013-06-25 12:27:45 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-06-25 12:29:48 +0900
commit2dabd04dc85fa8486e93a54758b0dafc7905dfa2 (patch)
treec70e87aa50a1d3fc6f0955ea97c13857e67400f3
parent2070ca420501b691d8420dbc5f5e705bda8cf498 (diff)
evas: fix problem with dllimport on Windows.
Signed-off-by: Cedric Bail <cedric.bail@samsung.com>
-rw-r--r--src/lib/evas/Evas_Eo.h16
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c16
2 files changed, 32 insertions, 0 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 9a2fa9213f..6ea32982b7 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -1,5 +1,21 @@
1#include <Eo.h> 1#include <Eo.h>
2 2
3#ifdef _WIN32
4# ifdef EAPI
5# undef EAPI
6# endif
7# ifdef EFL_EVAS_BUILD
8# ifdef DLL_EXPORT
9# define EAPI __declspec(dllexport)
10# else
11# define EAPI
12# endif /* ! DLL_EXPORT */
13# else
14# define EAPI
15# endif /* ! EFL_EVAS_BUILD */
16#else
17#endif /* ! _WIN32 */
18
3EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN; 19EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_IN;
4EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT; 20EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_OUT;
5EAPI extern const Eo_Event_Description _EVAS_OBJECT_EVENT_MOUSE_DOWN; 21EAPI 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 8dbdfe8cbe..9e1e3a8cb0 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,6 +1,22 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#ifdef _WIN32
5# ifdef EAPI
6# undef EAPI
7# endif
8# ifdef EFL_EVAS_BUILD
9# ifdef DLL_EXPORT
10# define EAPI __declspec(dllexport)
11# else
12# define EAPI
13# endif /* ! DLL_EXPORT */
14# else
15# define EAPI
16# endif /* ! EFL_EVAS_BUILD */
17#else
18#endif /* ! _WIN32 */
19
4int _evas_event_counter = 0; 20int _evas_event_counter = 0;
5 21
6EVAS_MEMPOOL(_mp_pc); 22EVAS_MEMPOOL(_mp_pc);