summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines
diff options
context:
space:
mode:
authorxcomputerman <xcomputerman>2010-01-29 06:12:35 +0000
committerxcomputerman <xcomputerman@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2010-01-29 06:12:35 +0000
commita61baea31e8f537cf86841b78a4eb28b652cfa6c (patch)
tree21b80574c45e40cb8f59ef576c6b42289ce7f5b6 /legacy/evas/src/modules/engines
parentdcd3b345e5b54bd9030567eca58d403b9252f147 (diff)
Various fixes to enable building SDL/OpenGLES
SVN revision: 45692
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/modules/engines/Makefile.am3
-rw-r--r--legacy/evas/src/modules/engines/gl_common/evas_gl_common.h22
-rw-r--r--legacy/evas/src/modules/engines/gl_sdl/evas_engine.h17
3 files changed, 22 insertions, 20 deletions
diff --git a/legacy/evas/src/modules/engines/Makefile.am b/legacy/evas/src/modules/engines/Makefile.am
index 7a20c88408..1db0e21e05 100644
--- a/legacy/evas/src/modules/engines/Makefile.am
+++ b/legacy/evas/src/modules/engines/Makefile.am
@@ -23,6 +23,9 @@ endif
23if !EVAS_STATIC_BUILD_GL_X11 23if !EVAS_STATIC_BUILD_GL_X11
24SUBDIRS += gl_common gl_x11 24SUBDIRS += gl_common gl_x11
25endif 25endif
26if !EVAS_STATIC_BUILD_GL_SDL
27SUBDIRS += gl_common gl_sdl
28endif
26if !EVAS_STATIC_BUILD_QUARTZ 29if !EVAS_STATIC_BUILD_QUARTZ
27SUBDIRS += quartz 30SUBDIRS += quartz
28endif 31endif
diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h b/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
index 8ec2b2b78b..13df063211 100644
--- a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
+++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
@@ -23,16 +23,20 @@
23# include <OpenGL/gl.h> 23# include <OpenGL/gl.h>
24# include <OpenGL/glext.h> 24# include <OpenGL/glext.h>
25#else 25#else
26# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) 26# ifdef _EVAS_ENGINE_SDL_H
27# if defined(GLES_VARIETY_S3C6410) 27# include <SDL/SDL_opengles.h>
28# include <GLES2/gl2.h>
29# elif defined(GLES_VARIETY_SGX)
30# include <GLES2/gl2.h>
31# include <GLES2/gl2ext.h>
32# endif
33# else 28# else
34# include <GL/gl.h> 29# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
35# include <GL/glext.h> 30# if defined(GLES_VARIETY_S3C6410)
31# include <GLES2/gl2.h>
32# elif defined(GLES_VARIETY_SGX)
33# include <GLES2/gl2.h>
34# include <GLES2/gl2ext.h>
35# endif
36# else
37# include <GL/gl.h>
38# include <GL/glext.h>
39# endif
36# endif 40# endif
37#endif 41#endif
38 42
diff --git a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.h b/legacy/evas/src/modules/engines/gl_sdl/evas_engine.h
index 92e2786274..36d91b497b 100644
--- a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.h
+++ b/legacy/evas/src/modules/engines/gl_sdl/evas_engine.h
@@ -1,27 +1,22 @@
1#ifndef EVAS_ENGINE_H 1#ifndef EVAS_ENGINE_H
2#define EVAS_ENGINE_H 2#define EVAS_ENGINE_H
3 3
4#define _EVAS_ENGINE_SDL_H
5
4#include "config.h" 6#include "config.h"
7#include <SDL/SDL.h>
5#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) 8#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX)
6# if defined(GLES_VARIETY_S3C6410) 9# include <EGL/egl.h>
7# include <EGL/egl.h> 10# include <SDL/SDL_opengles.h>
8# include <GLES2/gl2.h>
9# elif defined(GLES_VARIETY_SGX)
10# include <EGL/egl.h>
11# include <GLES2/gl2.h>
12# include <GLES2/gl2ext.h>
13# endif
14# ifdef HAVE_SDL_FLAG_OPENGLES 11# ifdef HAVE_SDL_FLAG_OPENGLES
15# define EVAS_SDL_GL_FLAG SDL_OPENGLES 12# define EVAS_SDL_GL_FLAG SDL_OPENGLES
16# else 13# else
17# define EVAS_SDL_GL_FLAG SDL_OPENGL /* This probably won't work? */ 14# define EVAS_SDL_GL_FLAG SDL_OPENGL /* This probably won't work? */
18# endif 15# endif
19#else 16#else
17# include <SDL/SDL_opengl.h>
20# define EVAS_SDL_GL_FLAG SDL_OPENGL 18# define EVAS_SDL_GL_FLAG SDL_OPENGL
21#endif 19#endif
22#include <SDL/SDL.h>
23#include <SDL/SDL_opengl.h>
24#include <GL/gl.h>
25#include "evas_common.h" 20#include "evas_common.h"
26#include "evas_private.h" 21#include "evas_private.h"
27#include "evas_gl_common.h" 22#include "evas_gl_common.h"