Remove all mentions of iOS

diff --git a/include/EDeviceTypes.h b/include/EDeviceTypes.h
index a0c1ca7c9a7919ca8400e251ddb395216118a144..853e825e1f537552c8eacf9716e8894b99ddcee9 100644 (file)
--- a/include/EDeviceTypes.h
+++ b/include/EDeviceTypes.h
@@ -24,10 +24,6 @@ namespace irr
                //! A device native to Mac OSX\r
                /** This device uses Apple's Cocoa API and works in Mac OSX 10.2 and above. */\r
                EIDT_OSX,\r
-        \r
-        //! A device native to the iOS\r
-               /** This device should be used with the OpenGL-ES driver. */\r
-               EIDT_IOS,\r
 \r
                //! A device which uses Simple DirectMedia Layer\r
                /** The SDL device works under all platforms supported by SDL but first must be compiled\r

diff --git a/include/SExposedVideoData.h b/include/SExposedVideoData.h
index ba47f1eccd665e9368ae89072298d77a41e5cf54..5e86562b1cccac679c668b893f9dca2f7c6f55dd 100644 (file)
--- a/include/SExposedVideoData.h
+++ b/include/SExposedVideoData.h
@@ -78,21 +78,6 @@ struct SExposedVideoData
                //! The EGLNativeWindowType object.\r
                void* Window;   \r
        };\r
-       \r
-       struct SOpenGLiOS\r
-       {\r
-               //! The EAGLContext object.\r
-               void* Context;\r
-                       \r
-               //! The subview UIView object where the drawing happens.\r
-               void* View;\r
-               \r
-               //! The UIViewController object.\r
-               void* ViewController;\r
-               \r
-               //! The UIWindow object.\r
-        void* Window;\r
-       };\r
 \r
        struct SOGLESAndroid\r
        {\r
@@ -107,7 +92,6 @@ struct SExposedVideoData
                SOpenGLLinux OpenGLLinux;\r
                SOpenGLOSX OpenGLOSX;\r
                SOpenGLFB OpenGLFB;\r
-               SOpenGLiOS OpenGLiOS;\r
                SOGLESAndroid OGLESAndroid;\r
        };\r
 };\r

diff --git a/include/SIrrCreationParameters.h b/include/SIrrCreationParameters.h
index bad56e3dd8edf60a492f474cbce80d602445309f..5c1f8da9293a3eb2fec5abc5ff2661dc5fdea030 100644 (file)
--- a/include/SIrrCreationParameters.h
+++ b/include/SIrrCreationParameters.h
@@ -235,7 +235,6 @@ namespace irr
                /** If this is set to a value other than 0, the Irrlicht Engine\r
                will be created in an already existing window.\r
                For Windows, set this to the HWND of the window you want.\r
-               For iOS, assign UIView to this variable.\r
                The windowSize and FullScreen options will be ignored when using\r
                the WindowId parameter. Default this is set to 0.\r
                To make Irrlicht run inside the custom window, you still will\r

diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index ba4a332c27a422deeed2beb09b89f8cc23e510f9..3ee35d9b5a073e03f84b5baed29f131f929949ad 100644 (file)
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -24,7 +24,7 @@
        #include <direct.h> // for _chdir\r
        #include <io.h> // for _access\r
        #include <tchar.h>\r
-#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_IOS_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))\r
+#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))\r
                #include <stdio.h>\r
                #include <stdlib.h>\r
                #include <string.h>\r

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
index 4d2ec7ec0bb4236d724011d334471c673c13dd83..e993ace12d1b403ed6360384e92aaf4036a6d073 100644 (file)
--- a/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@ -77,23 +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(WARNING "SDL2 backend is not supported on iOS")
-               set(USE_SDL2 FALSE)
-       endif()
-       set(DEVICE "IOS")
-elseif(OSX)
+elseif(APPLE)
        add_definitions(-D_IRR_OSX_PLATFORM_)
        set(DEVICE "OSX")
 elseif(ANDROID)
@@ -150,26 +140,26 @@ endif()
 
 # OpenGL
 
-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)
@@ -199,8 +189,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()
 
@@ -208,8 +196,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_)
        endif()
 endif()
 

diff --git a/source/Irrlicht/os.cpp b/source/Irrlicht/os.cpp
index 6b386574127a6c267c07021fde324e271c30b47b..cdd1a26c46c0c710ccead5e694f9a71f7530a0cb 100644 (file)
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -17,7 +17,7 @@
        #define bswap_32(X) _byteswap_ulong(X)\r
        #define bswap_64(X) _byteswap_uint64(X)\r
        #define localtime _localtime_s\r
-#elif defined(_IRR_OSX_PLATFORM_) || defined(_IRR_IOS_PLATFORM_)\r
+#elif defined(_IRR_OSX_PLATFORM_)\r
        #include <libkern/OSByteOrder.h>\r
        #define bswap_16(X) OSReadSwapInt16(&X,0)\r
        #define bswap_32(X) OSReadSwapInt32(&X,0)\r