From ea5b5d1c551935d596e8f8ccdbbb7cf62c1bb4a5 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 2 Jul 2025 08:05:15 +0200 Subject: [PATCH] Simplify OpenGL ES detection --- miniwin/CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/miniwin/CMakeLists.txt b/miniwin/CMakeLists.txt index 5d614ed5..c2aa0bd6 100644 --- a/miniwin/CMakeLists.txt +++ b/miniwin/CMakeLists.txt @@ -44,20 +44,16 @@ else() message(STATUS "🧩 OpenGL 1.x support not enabled — needs OpenGL") endif() -if(EMSCRIPTEN) - message(STATUS "Found OpenGL: enabling OpenGL ES 2.x renderer for Emscripten") +find_library(OPENGL_ES2_LIBRARY NAMES GLESv2) +if(EMSCRIPTEN OR OPENGL_ES2_LIBRARY) + message(STATUS "Found OpenGL: enabling OpenGL ES 2.x renderer") target_sources(miniwin PRIVATE src/d3drm/backends/opengles2/renderer.cpp) target_compile_definitions(miniwin PRIVATE USE_OPENGLES2) -else() - find_library(OPENGL_ES2_LIBRARY NAMES GLESv2) if(OPENGL_ES2_LIBRARY) - message(STATUS "Found OpenGL: enabling OpenGL ES 2.x renderer") - target_sources(miniwin PRIVATE src/d3drm/backends/opengles2/renderer.cpp) - target_compile_definitions(miniwin PRIVATE USE_OPENGLES2) target_link_libraries(miniwin PRIVATE OpenGL::GL) - else() - message(STATUS "🧩 OpenGL ES 2.x support not enabled") endif() +else() + message(STATUS "🧩 OpenGL ES 2.x support not enabled") endif() if(NINTENDO_3DS)