author | Gabriel Jacobo <gabomdq@gmail.com> |
Sun, 25 Aug 2013 11:48:49 -0300 | |
changeset 7698 | a60b3c292f0f |
parent 7697 | 678f71df2c6b |
child 7699 | 80267e65554d |
--- a/src/video/SDL_video.c Sat Aug 24 21:15:10 2013 -0400 +++ b/src/video/SDL_video.c Sun Aug 25 11:48:49 2013 -0300 @@ -39,9 +39,10 @@ #include "SDL_opengles.h" #endif /* SDL_VIDEO_OPENGL_ES */ -#if SDL_VIDEO_OPENGL_ES2 +/* GL and GLES2 headers conflict on Linux 32 bits */ +#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL #include "SDL_opengles2.h" -#endif /* SDL_VIDEO_OPENGL_ES2 */ +#endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */ #include "SDL_syswm.h"