blob: c400577e13169fb5bb43f7f671667811dc2e102d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
|
--- SDL2-2.0.10/src/video/SDL_video.c.old 2019-07-25 04:32:37.000000000 +0000
+++ SDL2-2.0.10/src/video/SDL_video.c 2020-01-20 17:32:52.918453596 +0000
@@ -37,7 +37,8 @@
#include "SDL_opengl.h"
#endif /* SDL_VIDEO_OPENGL */
-#if SDL_VIDEO_OPENGL_ES
+/* GL and GLES headers conflict on Linux 32 bits */
+#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
#include "SDL_opengles.h"
#endif /* SDL_VIDEO_OPENGL_ES */
|
