From 1ea0854c71645db6db161f3225fc79e24d3927bf Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 5 Sep 2023 20:35:38 +1000 Subject: [PATCH] CMake: Enable EGL even if Wayland is disabled --- CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39da19a0c..55467ecd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,11 +47,6 @@ if((LINUX OR FREEBSD) AND NOT ANDROID) option(USE_DBUS "Enable DBus support for screensaver inhibiting" ON) endif() -# Force EGL when using Wayland -if(USE_WAYLAND) - set(USE_EGL ON) -endif() - if(ANDROID) if(CMAKE_BUILD_TYPE STREQUAL "Release") set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) @@ -86,9 +81,13 @@ if(BUILD_QT_FRONTEND) endif() -if(USE_EGL) +# Everything except Windows/Mac use EGL. +if(ENABLE_OPENGL AND (LINUX OR FREEBSD OR ANDROID)) find_package(EGL REQUIRED) + set(USE_EGL TRUE) endif() + + if(USE_X11) find_package(X11 REQUIRED) if (NOT X11_Xrandr_FOUND)