From: numzero <numzer0@yandex.ru>
Date: Sat, 25 Mar 2023 07:42:11 +0000 (+0300)
Subject: Resolve conflicts with master
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=d97d1708d68a98c039db8a06c4110bfc961d3fb1;p=irrlicht.git

Resolve conflicts with master
---

d97d1708d68a98c039db8a06c4110bfc961d3fb1
diff --cc source/Irrlicht/CMakeLists.txt
index fa345ca,e993ace..ad11dd4
--- a/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@@ -148,9 -140,7 +139,9 @@@ endif(
  
  # OpenGL
  
 +option(ENABLE_OPENGL3 "Enable OpenGL 3+" FALSE)
 +
- if(IOS OR ANDROID OR EMSCRIPTEN)
+ if(ANDROID OR EMSCRIPTEN)
  	set(ENABLE_OPENGL FALSE)
  else()
  	option(ENABLE_OPENGL "Enable OpenGL" TRUE)
@@@ -219,11 -196,6 +208,9 @@@ if(ENABLE_GLES2
  	add_definitions(-D_IRR_COMPILE_WITH_OGLES2_)
  	if(DEVICE MATCHES "^(WINDOWS|X11|ANDROID)$" OR EMSCRIPTEN)
  		add_definitions(-D_IRR_COMPILE_WITH_EGL_MANAGER_ -D_IRR_OGLES2_USE_EXTPOINTER_)
- 	elseif(DEVICE STREQUAL "IOS")
- 		add_definitions(-D_IRR_COMPILE_WITH_EAGL_MANAGER_)
 +	elseif(DEVICE STREQUAL "SDL")
 +		set(USE_SDLGL ON)
 +		set(USE_SDLGLES2 ON)
  	endif()
  endif()