summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-28 14:24:11 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-05-07 09:53:10 +0200
commit71b7fc982a2e23bcb41bf6d227bceeba1f5596ec (patch)
tree4a6b8a01e76fec5797ff183ea556c229cfdc520d
parent7b52ecc9b9ae2f37d8771060e12f1d1f1e165265 (diff)
evas: remove the need to order the header correctly for Windows.
Diffstat (limited to '')
-rw-r--r--src/lib/evas/Evas.h4
-rw-r--r--src/lib/evas/Evas_GL.h29
-rw-r--r--src/lib/evas/Evas_Loader.h3
-rw-r--r--src/lib/evas/cserve2/evas_cs2_private.h26
-rw-r--r--src/lib/evas/include/evas_common_private.h29
-rw-r--r--src/lib/evas/include/evas_filter.h30
-rw-r--r--src/lib/evas/include/evas_private.h26
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h29
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_core.h30
9 files changed, 205 insertions, 1 deletions
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index 71d91eab8b..9abcfd3376 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -292,8 +292,12 @@ extern "C" {
292#ifdef EFL_EO_API_SUPPORT 292#ifdef EFL_EO_API_SUPPORT
293#include <Evas_Eo.h> 293#include <Evas_Eo.h>
294#endif 294#endif
295
295#ifdef __cplusplus 296#ifdef __cplusplus
296} 297}
297#endif 298#endif
298 299
300#undef EAPI
301#define EAPI
302
299#endif 303#endif
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index 5a7efef220..255ccfccec 100644
--- a/src/lib/evas/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
@@ -4,6 +4,32 @@
4#include <Evas.h> 4#include <Evas.h>
5//#include <GL/gl.h> 5//#include <GL/gl.h>
6 6
7#ifdef EAPI
8# undef EAPI
9#endif
10
11#ifdef _WIN32
12# ifdef EFL_EVAS_BUILD
13# ifdef DLL_EXPORT
14# define EAPI __declspec(dllexport)
15# else
16# define EAPI
17# endif /* ! DLL_EXPORT */
18# else
19# define EAPI __declspec(dllimport)
20# endif /* ! EFL_EVAS_BUILD */
21#else
22# ifdef __GNUC__
23# if __GNUC__ >= 4
24# define EAPI __attribute__ ((visibility("default")))
25# else
26# define EAPI
27# endif
28# else
29# define EAPI
30# endif
31#endif /* ! _WIN32 */
32
7#ifdef __cplusplus 33#ifdef __cplusplus
8extern "C" { 34extern "C" {
9#endif 35#endif
@@ -4616,6 +4642,9 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
4616} 4642}
4617#endif 4643#endif
4618 4644
4645#undef EAPI
4646#define EAPI
4647
4619#endif 4648#endif
4620/** 4649/**
4621 * @} 4650 * @}
diff --git a/src/lib/evas/Evas_Loader.h b/src/lib/evas/Evas_Loader.h
index ab2fd134c5..58e760c853 100644
--- a/src/lib/evas/Evas_Loader.h
+++ b/src/lib/evas/Evas_Loader.h
@@ -215,4 +215,7 @@ EAPI Eina_Bool evas_module_unregister (const Evas_Module_Api *module, Evas_Mo
215} 215}
216#endif 216#endif
217 217
218#undef EAPI
219#define EAPI
220
218#endif 221#endif
diff --git a/src/lib/evas/cserve2/evas_cs2_private.h b/src/lib/evas/cserve2/evas_cs2_private.h
index 2d4aeb435b..9412a7d633 100644
--- a/src/lib/evas/cserve2/evas_cs2_private.h
+++ b/src/lib/evas/cserve2/evas_cs2_private.h
@@ -4,6 +4,32 @@
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_cs2.h" 5#include "evas_cs2.h"
6 6
7#ifdef EAPI
8# undef EAPI
9#endif
10
11#ifdef _WIN32
12# ifdef EFL_EVAS_BUILD
13# ifdef DLL_EXPORT
14# define EAPI __declspec(dllexport)
15# else
16# define EAPI
17# endif /* ! DLL_EXPORT */
18# else
19# define EAPI __declspec(dllimport)
20# endif /* ! EFL_EVAS_BUILD */
21#else
22# ifdef __GNUC__
23# if __GNUC__ >= 4
24# define EAPI __attribute__ ((visibility("default")))
25# else
26# define EAPI
27# endif
28# else
29# define EAPI
30# endif
31#endif /* ! _WIN32 */
32
7#define SHARED_BUFFER_PATH_MAX 64 33#define SHARED_BUFFER_PATH_MAX 64
8typedef struct _Data_Entry Data_Entry; 34typedef struct _Data_Entry Data_Entry;
9typedef struct _Font_Entry Font_Entry; 35typedef struct _Font_Entry Font_Entry;
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 6b4cf5e623..17a08bdd20 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -57,6 +57,32 @@
57#include "Evas.h" 57#include "Evas.h"
58//#include "Evas_GL.h" 58//#include "Evas_GL.h"
59 59
60#ifdef EAPI
61# undef EAPI
62#endif
63
64#ifdef _WIN32
65# ifdef EFL_EVAS_BUILD
66# ifdef DLL_EXPORT
67# define EAPI __declspec(dllexport)
68# else
69# define EAPI
70# endif /* ! DLL_EXPORT */
71# else
72# define EAPI __declspec(dllimport)
73# endif /* ! EFL_EVAS_BUILD */
74#else
75# ifdef __GNUC__
76# if __GNUC__ >= 4
77# define EAPI __attribute__ ((visibility("default")))
78# else
79# define EAPI
80# endif
81# else
82# define EAPI
83# endif
84#endif /* ! _WIN32 */
85
60#ifndef HAVE_LROUND 86#ifndef HAVE_LROUND
61/* right now i dont care about rendering bugs on platforms without lround 87/* right now i dont care about rendering bugs on platforms without lround
62 (e.g. windows/vc++... yay!) 88 (e.g. windows/vc++... yay!)
@@ -1317,6 +1343,9 @@ void evas_common_rgba_image_scalecache_item_unref(Image_Entry *ie);
1317 1343
1318/*****************************************************************************/ 1344/*****************************************************************************/
1319 1345
1346#undef EAPI
1347#define EAPI
1348
1320#ifdef __cplusplus 1349#ifdef __cplusplus
1321} 1350}
1322#endif 1351#endif
diff --git a/src/lib/evas/include/evas_filter.h b/src/lib/evas/include/evas_filter.h
index 70b45bfdb1..22804413c5 100644
--- a/src/lib/evas/include/evas_filter.h
+++ b/src/lib/evas/include/evas_filter.h
@@ -4,6 +4,32 @@
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_private.h" 5#include "evas_private.h"
6 6
7#ifdef EAPI
8# undef EAPI
9#endif
10
11#ifdef _WIN32
12# ifdef EFL_EVAS_BUILD
13# ifdef DLL_EXPORT
14# define EAPI __declspec(dllexport)
15# else
16# define EAPI
17# endif /* ! DLL_EXPORT */
18# else
19# define EAPI __declspec(dllimport)
20# endif /* ! EFL_EVAS_BUILD */
21#else
22# ifdef __GNUC__
23# if __GNUC__ >= 4
24# define EAPI __attribute__ ((visibility("default")))
25# else
26# define EAPI
27# endif
28# else
29# define EAPI
30# endif
31#endif /* ! _WIN32 */
32
7typedef struct _Evas_Filter_Context Evas_Filter_Context; 33typedef struct _Evas_Filter_Context Evas_Filter_Context;
8typedef struct _Evas_Filter_Command Evas_Filter_Command; 34typedef struct _Evas_Filter_Command Evas_Filter_Command;
9typedef struct _Evas_Filter_Instruction Evas_Filter_Instruction; 35typedef struct _Evas_Filter_Instruction Evas_Filter_Instruction;
@@ -249,5 +275,7 @@ struct _Evas_Filter_Proxy_Binding
249 Eina_Stringshare *name; 275 Eina_Stringshare *name;
250}; 276};
251 277
252#endif 278#undef EAPI
279#define EAPI
253 280
281#endif
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 427a71de0d..7d9303c802 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -15,6 +15,32 @@
15 15
16#include "evas_3d_utils.h" 16#include "evas_3d_utils.h"
17 17
18#ifdef EAPI
19# undef EAPI
20#endif
21
22#ifdef _WIN32
23# ifdef EFL_EVAS_BUILD
24# ifdef DLL_EXPORT
25# define EAPI __declspec(dllexport)
26# else
27# define EAPI
28# endif /* ! DLL_EXPORT */
29# else
30# define EAPI __declspec(dllimport)
31# endif /* ! EFL_EVAS_BUILD */
32#else
33# ifdef __GNUC__
34# if __GNUC__ >= 4
35# define EAPI __attribute__ ((visibility("default")))
36# else
37# define EAPI
38# endif
39# else
40# define EAPI
41# endif
42#endif /* ! _WIN32 */
43
18#define RENDER_METHOD_INVALID 0x00000000 44#define RENDER_METHOD_INVALID 0x00000000
19 45
20//#define REND_DBG 1 46//#define REND_DBG 1
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 4460835255..adc2ba2c54 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -309,6 +309,32 @@ typedef Eina_Bool (*evas_gl_make_current_cb)(void *engine_data, void *doit);
309/* enum Evas_GL_Shader is defined below */ 309/* enum Evas_GL_Shader is defined below */
310#include "shader/evas_gl_enum.x" 310#include "shader/evas_gl_enum.x"
311 311
312#ifdef EAPI
313# undef EAPI
314#endif
315
316#ifdef _WIN32
317# ifdef EFL_EVAS_BUILD
318# ifdef DLL_EXPORT
319# define EAPI __declspec(dllexport)
320# else
321# define EAPI
322# endif /* ! DLL_EXPORT */
323# else
324# define EAPI __declspec(dllimport)
325# endif /* ! EFL_EVAS_BUILD */
326#else
327# ifdef __GNUC__
328# if __GNUC__ >= 4
329# define EAPI __attribute__ ((visibility("default")))
330# else
331# define EAPI
332# endif
333# else
334# define EAPI
335# endif
336#endif /* ! _WIN32 */
337
312struct _Evas_GL_Program 338struct _Evas_GL_Program
313{ 339{
314 GLuint vert, frag, prog; 340 GLuint vert, frag, prog;
@@ -1035,4 +1061,7 @@ _comp_tex_sub_2d(Evas_Engine_GL_Context *gc, int x, int y, int w, int h, int fmt
1035 1061
1036#include "evas_gl_3d_common.h" 1062#include "evas_gl_3d_common.h"
1037 1063
1064#undef EAPI
1065#define EAPI
1066
1038#endif 1067#endif
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.h b/src/modules/evas/engines/gl_common/evas_gl_core.h
index 8496b33644..9f34df6f90 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.h
@@ -3,6 +3,32 @@
3#define EVAS_GL_NO_GL_H_CHECK 1 3#define EVAS_GL_NO_GL_H_CHECK 1
4#include "Evas_GL.h" 4#include "Evas_GL.h"
5 5
6#ifdef EAPI
7# undef EAPI
8#endif
9
10#ifdef _WIN32
11# ifdef EFL_EVAS_BUILD
12# ifdef DLL_EXPORT
13# define EAPI __declspec(dllexport)
14# else
15# define EAPI
16# endif /* ! DLL_EXPORT */
17# else
18# define EAPI __declspec(dllimport)
19# endif /* ! EFL_EVAS_BUILD */
20#else
21# ifdef __GNUC__
22# if __GNUC__ >= 4
23# define EAPI __attribute__ ((visibility("default")))
24# else
25# define EAPI
26# endif
27# else
28# define EAPI
29# endif
30#endif /* ! _WIN32 */
31
6typedef void *EVGLNative_Display; 32typedef void *EVGLNative_Display;
7typedef void *EVGLNative_Window; 33typedef void *EVGLNative_Window;
8typedef void *EVGLNative_Surface; 34typedef void *EVGLNative_Surface;
@@ -60,4 +86,8 @@ void evgl_direct_partial_info_set(int pres);
60void evgl_direct_partial_info_clear(); 86void evgl_direct_partial_info_clear();
61void evgl_direct_partial_render_start(); 87void evgl_direct_partial_render_start();
62void evgl_direct_partial_render_end(); 88void evgl_direct_partial_render_end();
89
90#undef EAPI
91#define EAPI
92
63#endif //_EVAS_GL_CORE_H 93#endif //_EVAS_GL_CORE_H