Resolve conflicts with master

[irrlicht.git] / source / Irrlicht / Irrlicht.cpp

diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp
index ed6b0828fdc6af59caa6b328e856bc507cd38489..d1d26780c249dd57d1d5133123cebcab8b8c65de 100644 (file)
--- a/source/Irrlicht/Irrlicht.cpp
+++ b/source/Irrlicht/Irrlicht.cpp
@@ -29,10 +29,6 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Geb
 #include "CIrrDeviceSDL.h"\r
 #endif\r
 \r
-#ifdef _IRR_COMPILE_WITH_IOS_DEVICE_\r
-#include "CIrrDeviceiOS.h"\r
-#endif\r
-\r
 #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_\r
 #include "Android/CIrrDeviceAndroid.h"\r
 #endif\r
@@ -78,11 +74,6 @@ namespace irr
                if (params.DeviceType == EIDT_X11 || (!dev && params.DeviceType == EIDT_BEST))\r
                        dev = new CIrrDeviceLinux(params);\r
 #endif\r
-        \r
-#ifdef _IRR_COMPILE_WITH_IOS_DEVICE_\r
-               if (params.DeviceType == EIDT_IOS || (!dev && params.DeviceType == EIDT_BEST))\r
-                       dev = new CIrrDeviceiOS(params);\r
-#endif\r
 \r
 #ifdef _IRR_COMPILE_WITH_ANDROID_DEVICE_\r
                if (params.DeviceType == EIDT_ANDROID || (!dev && params.DeviceType == EIDT_BEST))\r