Restore isDriverSupported, but in a cpp file

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

diff --git a/source/Irrlicht/Irrlicht.cpp b/source/Irrlicht/Irrlicht.cpp
index 0745c5edd9d3a4f0fcedb1bac2a350fda7025299..50348e7f403d772796351d1dcaf6c5a5d9ecad53 100644 (file)
--- a/source/Irrlicht/Irrlicht.cpp
+++ b/source/Irrlicht/Irrlicht.cpp
@@ -2,13 +2,12 @@
 // 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
 #ifdef _IRR_WINDOWS_\r
        #include <windows.h>\r
-       #if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(_WIN32_WCE)\r
+       #if defined(_DEBUG) && !defined(__GNUWIN32__)\r
                #include <crtdbg.h>\r
        #endif // _DEBUG\r
 #endif\r
@@ -26,18 +25,10 @@ static const char* const copyright = "Irrlicht Engine (c) 2002-2017 Nikolaus Geb
 #include "CIrrDeviceOSX.h"\r
 #endif\r
 \r
-#ifdef _IRR_COMPILE_WITH_FB_DEVICE_\r
-#include "CIrrDeviceFB.h"\r
-#endif\r
-\r
 #ifdef _IRR_COMPILE_WITH_SDL_DEVICE_\r
 #include "CIrrDeviceSDL.h"\r
 #endif\r
 \r
-#ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_\r
-#include "CIrrDeviceConsole.h"\r
-#endif\r
-\r
 #ifdef _IRR_COMPILE_WITH_IOS_DEVICE_\r
 #include "CIrrDeviceiOS.h"\r
 #endif\r
@@ -103,16 +94,6 @@ namespace irr
                        dev = new CIrrDeviceSDL(params);\r
 #endif\r
 \r
-#ifdef _IRR_COMPILE_WITH_FB_DEVICE_\r
-               if (params.DeviceType == EIDT_FRAMEBUFFER || (!dev && params.DeviceType == EIDT_BEST))\r
-                       dev = new CIrrDeviceFB(params);\r
-#endif\r
-\r
-#ifdef _IRR_COMPILE_WITH_CONSOLE_DEVICE_\r
-               if (params.DeviceType == EIDT_CONSOLE || (!dev && params.DeviceType == EIDT_BEST))\r
-                       dev = new CIrrDeviceConsole(params);\r
-#endif\r
-\r
                if (dev && !dev->getVideoDriver() && params.DriverType != video::EDT_NULL)\r
                {\r
                        dev->closeDevice(); // destroy window\r
@@ -132,7 +113,26 @@ namespace core
 namespace video\r
 {\r
        SMaterial IdentityMaterial;\r
-       u32 MATERIAL_MAX_TEXTURES_USED = MATERIAL_MAX_TEXTURES;\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 _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
@@ -149,7 +149,7 @@ BOOL APIENTRY DllMain( HANDLE hModule,
     switch (ul_reason_for_call)\r
        {\r
                case DLL_PROCESS_ATTACH:\r
-                       #if defined(_DEBUG) && !defined(__GNUWIN32__) && !defined(__BORLANDC__) && !defined (_WIN32_WCE) && !defined (_IRR_XBOX_PLATFORM_)\r
+                       #if defined(_DEBUG) && !defined(__GNUWIN32__)\r
                                _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF | _CRTDBG_ALLOC_MEM_DF);\r
                        #endif\r
                        break;\r