Merge pull request #21 from psyke83/mesa_build_fix
Fixed bug 4797 - SDL fails to compile with Mesa Master (thanks Michae…
This commit is contained in:
commit
67d825d8ad
1 changed files with 2 additions and 2 deletions
|
@ -37,9 +37,9 @@
|
|||
#include "SDL_opengl.h"
|
||||
#endif /* SDL_VIDEO_OPENGL */
|
||||
|
||||
#if SDL_VIDEO_OPENGL_ES
|
||||
#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
|
||||
#include "SDL_opengles.h"
|
||||
#endif /* SDL_VIDEO_OPENGL_ES */
|
||||
#endif /* SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL */
|
||||
|
||||
/* GL and GLES2 headers conflict on Linux 32 bits */
|
||||
#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue