From 68c6d6c932decfdfd3fd2357e69f196067e7ca02 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 21 Nov 2022 20:32:10 -0600 Subject: [PATCH] Attempt to fix build with SDL 2.26 on systems with old GL headers --- app/streaming/video/ffmpeg-renderers/eglvid.cpp | 2 -- app/streaming/video/ffmpeg-renderers/eglvid.h | 3 ++- config.tests/EGL/main.cpp | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.cpp b/app/streaming/video/ffmpeg-renderers/eglvid.cpp index fa8a7d76..9b5a43f9 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/eglvid.cpp @@ -10,8 +10,6 @@ #include #include -#include -#include #include #include diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.h b/app/streaming/video/ffmpeg-renderers/eglvid.h index cf110728..a06764bb 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.h +++ b/app/streaming/video/ffmpeg-renderers/eglvid.h @@ -2,8 +2,9 @@ #include "renderer.h" +#define SDL_USE_BUILTIN_OPENGL_DEFINITIONS 1 +#include #include -#include class EGLRenderer : public IFFmpegRenderer { public: diff --git a/config.tests/EGL/main.cpp b/config.tests/EGL/main.cpp index 690d0015..1ad9236d 100644 --- a/config.tests/EGL/main.cpp +++ b/config.tests/EGL/main.cpp @@ -1,3 +1,5 @@ +#define SDL_USE_BUILTIN_OPENGL_DEFINITIONS 1 + #include #include