Reduce IrrCompileConfig usage to files that actually need it

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

diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h
index d8ecc2efa6ee0621f846639870b807359209e972..52a0604a81410c670d95adb58f31a84373701ec1 100644 (file)
--- a/source/Irrlicht/COpenGLCommon.h
+++ b/source/Irrlicht/COpenGLCommon.h
@@ -5,7 +5,6 @@
 #ifndef __C_OPENGL_COMMON_H_INCLUDED__\r
 #define __C_OPENGL_COMMON_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
 \r
 #ifdef _IRR_COMPILE_WITH_OPENGL_\r
 \r
@@ -20,11 +19,6 @@
                #include <GL/glext.h>\r
        #endif\r
        #include <GL/wglext.h>\r
-\r
-       #ifdef _MSC_VER\r
-               #pragma comment(lib, "OpenGL32.lib")\r
-       #endif\r
-\r
 #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)\r
        #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
                #define GL_GLEXT_LEGACY 1\r
@@ -36,13 +30,15 @@
 #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
        #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
                #define GL_GLEXT_LEGACY 1\r
-               #define GLX_GLXEXT_LEGACY 1\r
        #else\r
                #define GL_GLEXT_PROTOTYPES 1\r
-               #define GLX_GLXEXT_PROTOTYPES 1\r
        #endif\r
-       #include <SDL/SDL_video.h>\r
-       #include <SDL/SDL_opengl.h>\r
+       #include <SDL_video.h>\r
+       #include <SDL_opengl.h>\r
+       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
+               // The SDL2 header doesn't cut it for extensions\r
+               #include <GL/glext.h>\r
+       #endif\r
 #else\r
        #if defined(_IRR_OPENGL_USE_EXTPOINTER_)\r
                #define GL_GLEXT_LEGACY 1\r