pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21 from psyke83/mesa_build_fix

Browse source 
Fixed bug 4797 - SDL fails to compile with Mesa Master (thanks Michae…
This commit is contained in:
Conn O'Griofa 2020-02-02 00:36:11 +00:00 • committed by GitHub
commit 67d825d8ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/SDL_video.c
View file

@ -37,9 +37,9 @@
#include "SDL_opengl.h" #include "SDL_opengl.h"
#endif /* SDL_VIDEO_OPENGL */ #endif /* SDL_VIDEO_OPENGL */
#if SDL_VIDEO_OPENGL_ES #if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
#include "SDL_opengles.h" #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 */ /* GL and GLES2 headers conflict on Linux 32 bits */
#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL #if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL