From: numzero Date: Mon, 13 Mar 2023 15:07:25 +0000 (+0300) Subject: Merge branch 'drop-irr-compile-config' into opengl3 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=d81db9dd6d3832beb48b2617404fea81ba45801d;p=irrlicht.git Merge branch 'drop-irr-compile-config' into opengl3 --- d81db9dd6d3832beb48b2617404fea81ba45801d diff --cc source/Irrlicht/CMakeLists.txt index a2ca46e,4d2ec7e..a57258d --- a/source/Irrlicht/CMakeLists.txt +++ b/source/Irrlicht/CMakeLists.txt @@@ -198,17 -195,9 +195,17 @@@ if(ENABLE_OPENGL endif() endif() +if(ENABLE_OPENGL3) + if (NOT USE_SDL2) + message(SEND_ERROR "OpenGL3 support requires SDL2") + endif() + set(USE_SDLGL ON) + set(USE_SDLGL3 ON) +endif() + if(ENABLE_GLES1) add_definitions(-D_IRR_COMPILE_WITH_OGLES1_) - if(DEVICE MATCHES "^WINDOWS|X11|ANDROID$") + if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$") add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_ -D_IRR_OGLES1_USE_EXTPOINTER_) elseif(DEVICE STREQUAL "IOS") add_definitions(-D_IRR_COMPILE_WITH_EAGL_MANAGER_)