Merge branch 'zan/cubemap'

[simgear.git] / simgear / screen / extensions.hxx

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index fe40550a32e0903ad34d71fd0c9620f56e8f7ff2..d7999bc62cc0d1d0627dd47e8811b467e2405071 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -24,22 +24,17 @@
 #ifndef __SG_EXTENSIONS_HXX
 #define __SG_EXTENSIONS_HXX 1
 
-#if defined(__CYGWIN__) && !defined(WIN32) /* && !defined(USING_X) */
-#define WIN32
-#endif
-
-#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+#ifdef WIN32
 # include <windows.h>
 #endif
 
-#if !defined(WIN32)
-# include <GL/glx.h>
-#endif
-
 #include <simgear/compiler.h>
 
-#include SG_GL_H
+#include <osg/GL>
 
+#if !defined(__APPLE__) && !defined(WIN32)
+#  include <GL/glx.h>
+#endif
 
 #if defined(__cplusplus)
 extern "C" {
@@ -50,13 +45,13 @@ extern "C" {
 #endif
 
 bool SGSearchExtensionsString(const char *extString, const char *extName);
-bool SGIsOpenGLExtensionSupported(char *extName);
+bool SGIsOpenGLExtensionSupported(const char *extName);
 
 #ifdef __APPLE__
   // don't use an inline function for symbol lookup, since it is too big
   void* macosxGetGLProcAddress(const char *func);
 
-#elif !defined( WIN32 ) && !defined( GLX_VERSION_1_4 )
+#elif !defined( WIN32 )
 
   void *SGGetGLProcAddress(const char *func);
   
@@ -70,9 +65,6 @@ inline void (*SGLookupFunction(const char *func))()
 #elif defined( __APPLE__ )
     return (void (*)()) macosxGetGLProcAddress(func);
 
-#elif defined( GLX_VERSION_1_4 )
-    return glXGetProcAddress((const GLubyte*)func);
-
 #else // UNIX, default
     return (void (*)()) SGGetGLProcAddress(func);
 #endif