Resolve conflicts with master

[irrlicht.git] / source / Irrlicht / CMakeLists.txt

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
index fa345cadd46871b6912ac393ede037caf4dc5df5..ad11dd45aa46adfc4aace25eee6cabf6cd3b4ce3 100644 (file)
--- a/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@ -77,22 +77,13 @@ add_definitions(
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
        set(SOLARIS TRUE)
 endif()
-if(APPLE AND NOT IOS)
-       set(OSX TRUE)
-endif()
 
 # Device
 
 if(WIN32)
        add_definitions(-D_IRR_WINDOWS_ -D_IRR_WINDOWS_API_)
        set(DEVICE "WINDOWS")
-elseif(IOS)
-       add_definitions(-D_IRR_IOS_PLATFORM_ -D_IRR_COMPILE_WITH_IOS_BUILTIN_MAIN_)
-       if(USE_SDL2)
-               message(SEND_ERROR "SDL2 backend is not supported on iOS")
-       endif()
-       set(DEVICE "IOS")
-elseif(OSX)
+elseif(APPLE)
        add_definitions(-D_IRR_OSX_PLATFORM_)
        set(DEVICE "OSX")
 elseif(ANDROID)
@@ -150,26 +141,26 @@ endif()
 
 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)
 endif()
 
-if(EMSCRIPTEN OR OSX)
+if(EMSCRIPTEN OR APPLE)
        set(ENABLE_GLES1 FALSE)
 else()
-       if(ANDROID OR IOS)
+       if(ANDROID)
                set(DEFAULT_GLES1 TRUE)
        endif()
        option(ENABLE_GLES1 "Enable OpenGL ES" ${DEFAULT_GLES1})
 endif()
 
-if(OSX)
+if(APPLE)
        set(ENABLE_GLES2 FALSE)
        set(ENABLE_WEBGL1 FALSE)
 else()
-       if(ANDROID OR IOS OR EMSCRIPTEN)
+       if(ANDROID OR EMSCRIPTEN)
                set(DEFAULT_GLES2 TRUE)
        endif()
        if(EMSCRIPTEN)
@@ -210,8 +201,6 @@ if(ENABLE_GLES1)
        add_definitions(-D_IRR_COMPILE_WITH_OGLES1_)
        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_)
        endif()
 endif()
 
@@ -219,8 +208,6 @@ 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)