Resolve conflicts with master

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

diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp
index 4438b51ce1b4757df2949b7012d15cad84278691..d1d26780c249dd57d1d5133123cebcab8b8c65de 100644 (file)
--- a/source/Irrlicht/Irrlicht.cpp
+++ b/source/Irrlicht/Irrlicht.cpp
@@ -2,7 +2,6 @@
 // This file is part of the "Irrlicht Engine".\r
 // For conditions of distribution and use, see copyright notice in irrlicht.h\r
 \r
-#include "IrrCompileConfig.h"\r
 \r
 static const char* const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Gebhardt";        // put string in binary\r
 \r
@@ -30,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
@@ -79,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
@@ -114,6 +104,29 @@ namespace core
 namespace video\r
 {\r
        SMaterial IdentityMaterial;\r
+\r
+       extern "C" IRRLICHT_API bool IRRCALLCONV isDriverSupported(E_DRIVER_TYPE driver)\r
+       {\r
+               switch (driver) {\r
+                       case EDT_NULL: return true;\r
+#ifdef ENABLE_OPENGL3\r
+                       case EDT_OPENGL3: return true;\r
+#endif\r
+#ifdef _IRR_COMPILE_WITH_OPENGL_\r
+                       case EDT_OPENGL: return true;\r
+#endif\r
+#ifdef _IRR_COMPILE_WITH_OGLES1_\r
+                       case EDT_OGLES1: return true;\r
+#endif\r
+#ifdef _IRR_COMPILE_WITH_OGLES2_\r
+                       case EDT_OGLES2: return true;\r
+#endif\r
+#ifdef _IRR_COMPILE_WITH_WEBGL1_\r
+                       case EDT_WEBGL1: return true;\r
+#endif\r
+                       default: return false;\r
+               }\r
+       }\r
 }\r
 \r
 } // end namespace irr\r