Merge commit '34de3b57a101f8d885041add5e21311a153bb1bf' into main

This commit is contained in:
Sam Lantinga 2021-03-15 09:00:32 -07:00
commit 3313c67c01
1 changed files with 9 additions and 2 deletions

View File

@ -795,11 +795,18 @@ macro(CheckOpenGLX11)
endif() endif()
endmacro() endmacro()
# Requires:
# - PkgCheckModules
macro(CheckEGL)
pkg_check_modules(EGL egl)
string(REPLACE "-D_THREAD_SAFE;" "-D_THREAD_SAFE=1;" EGL_CFLAGS ${EGL_CFLAGS})
endmacro()
# Requires: # Requires:
# - PkgCheckModules # - PkgCheckModules
macro(CheckEGLKMSDRM) macro(CheckEGLKMSDRM)
if (HAVE_VIDEO_OPENGLES OR HAVE_VIDEO_OPENGL) if (HAVE_VIDEO_OPENGLES OR HAVE_VIDEO_OPENGL)
pkg_check_modules(EGL egl) CheckEGL()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${EGL_CFLAGS}") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${EGL_CFLAGS}")
check_c_source_compiles(" check_c_source_compiles("
#define EGL_API_FB #define EGL_API_FB
@ -817,7 +824,7 @@ endmacro()
# Requires: # Requires:
# - PkgCheckModules # - PkgCheckModules
macro(CheckOpenGLESX11) macro(CheckOpenGLESX11)
pkg_check_modules(EGL egl) CheckEGL()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${EGL_CFLAGS}") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${EGL_CFLAGS}")
if(VIDEO_OPENGLES) if(VIDEO_OPENGLES)
check_c_source_compiles(" check_c_source_compiles("