Reduce IrrCompileConfig usage to files that actually need it

[irrlicht.git] / source / Irrlicht / CEGLManager.h

diff --git a/source/Irrlicht/CEGLManager.h b/source/Irrlicht/CEGLManager.h
index c82d48c67a300e6fd023ac0900625dd14e72997f..78e96c882fa016677507f2c6935f3bdeb087046e 100755 (executable)
--- a/source/Irrlicht/CEGLManager.h
+++ b/source/Irrlicht/CEGLManager.h
@@ -5,7 +5,6 @@
 #ifndef __C_EGL_MANAGER_H_INCLUDED__\r
 #define __C_EGL_MANAGER_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
 \r
 #ifdef _IRR_COMPILE_WITH_EGL_MANAGER_\r
 \r
@@ -15,10 +14,6 @@
 #include "SExposedVideoData.h"\r
 #include "IContextManager.h"\r
 \r
-#ifdef _MSC_VER\r
-#pragma comment(lib, "libEGL.lib")\r
-#endif\r
-\r
 namespace irr\r
 {\r
 namespace video\r
@@ -36,39 +31,42 @@ namespace video
                // Initialize EGL.\r
                /* This method initialize EGLand create EGL display, anyway surface and context\r
                aren't create. */\r
-               virtual bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) _IRR_OVERRIDE_;\r
+               bool initialize(const SIrrlichtCreationParameters& params, const SExposedVideoData& data) override;\r
 \r
                // Terminate EGL.\r
                /* Terminate EGL context. This method break both existed surface and context. */\r
-               virtual void terminate() _IRR_OVERRIDE_;\r
+               void terminate() override;\r
 \r
                // Create EGL surface.\r
                /* This method create EGL surface. On some platforms eg. Android, we must\r
                recreate surface on each resume, because WindowID may change, so existed\r
                surface may not be valid. If EGL context already exist, this method\r
                automatically activates it. */\r
-               virtual bool generateSurface() _IRR_OVERRIDE_;\r
+               bool generateSurface() override;\r
 \r
                // Destroy EGL surface.\r
                /* This method destroy EGL. On some platforms eg. Android, we should call\r
                this method on each pause, because after resume this surface may not be valid.\r
                Hovewer this method doesn'r break EGL context. */\r
-               virtual void destroySurface() _IRR_OVERRIDE_;\r
+               void destroySurface() override;\r
 \r
                // Create EGL context.\r
                /* This method create and activate EGL context. */\r
-               virtual bool generateContext() _IRR_OVERRIDE_;\r
+               bool generateContext() override;\r
 \r
                // Destroy EGL context.\r
                /* This method destroy EGL context. */\r
-               virtual void destroyContext() _IRR_OVERRIDE_;\r
+               void destroyContext() override;\r
+\r
+               const SExposedVideoData& getContext() const override;\r
 \r
-               virtual const SExposedVideoData& getContext() const _IRR_OVERRIDE_;\r
+               bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) override;\r
 \r
-               virtual bool activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) _IRR_OVERRIDE_;\r
+               // Get procedure address.\r
+               void* getProcAddress(const std::string &procName) override;\r
 \r
                // Swap buffers.\r
-               virtual bool swapBuffers() _IRR_OVERRIDE_;\r
+               bool swapBuffers() override;\r
 \r
        protected:\r
                enum EConfigStyle\r