summaryrefslogtreecommitdiff
path: root/src/modules
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 /src/modules
parent7b52ecc9b9ae2f37d8771060e12f1d1f1e165265 (diff)
evas: remove the need to order the header correctly for Windows.
Diffstat (limited to 'src/modules')
-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
2 files changed, 59 insertions, 0 deletions
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 4460835..adc2ba2 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 8496b33..9f34df6 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