]> git.lizzy.rs Git - irrlicht.git/commitdiff
Merge branch 'drop-irr-compile-config' into opengl3
authornumzero <numzer0@yandex.ru>
Mon, 13 Mar 2023 15:07:25 +0000 (18:07 +0300)
committernumzero <numzer0@yandex.ru>
Mon, 13 Mar 2023 15:07:25 +0000 (18:07 +0300)
1  2 
include/IVideoDriver.h
source/Irrlicht/CMakeLists.txt

Simple merge
index a2ca46e4828c835735a5ae99d86f6dc3d3ca64e1,4d2ec7ec0bb4236d724011d334471c673c13dd83..a57258d20bbea062fcbab5999f802abdb8d6f2c1
@@@ -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_)