Remove all mentions of iOS

3 files changed, 8 insertions, 22 deletions

diff --git a/source/Irrlicht/CFileSystem.cpp b/source/Irrlicht/CFileSystem.cpp
index ba4a332..3ee35d9 100644
--- a/source/Irrlicht/CFileSystem.cpp
+++ b/source/Irrlicht/CFileSystem.cpp
@@ -24,7 +24,7 @@
 	#include <direct.h> // for _chdir

 	#include <io.h> // for _access

 	#include <tchar.h>

-#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_IOS_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))

+#elif (defined(_IRR_POSIX_API_) || defined(_IRR_OSX_PLATFORM_) || defined(_IRR_ANDROID_PLATFORM_))

 		#include <stdio.h>

 		#include <stdlib.h>

 		#include <string.h>

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
index 4d2ec7e..e993ace 100644
--- 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 6b38657..cdd1a26 100644
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -17,7 +17,7 @@
 	#define bswap_32(X) _byteswap_ulong(X)

 	#define bswap_64(X) _byteswap_uint64(X)

 	#define localtime _localtime_s

-#elif defined(_IRR_OSX_PLATFORM_) || defined(_IRR_IOS_PLATFORM_)

+#elif defined(_IRR_OSX_PLATFORM_)

 	#include <libkern/OSByteOrder.h>

 	#define bswap_16(X) OSReadSwapInt16(&X,0)

 	#define bswap_32(X) OSReadSwapInt32(&X,0)