cygwin and mingw fixes

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

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index 77efd3c3af93a584cce905e880780660170773be..a15a475989d585fe21350da0614a58f4378232f8 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -24,8 +24,15 @@
 #ifndef __SG_EXTENSIONS_HXX
 #define __SG_EXTENSIONS_HXX 1
 
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+# include <windows.h>
+#else
+# include <dlfcn.h>
+#endif
+
 #include <GL/gl.h>
 
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -37,17 +44,24 @@ extern "C" {
 static bool SGSearchExtensionsString(char *extString, char *extName);
 bool SGIsOpenGLExtensionSupported(char *extName);
 
+#ifdef __APPLE__
+  // don't use an inline function for symbol lookup, since it is too big
+  void* macosxGetGLProcAddress(const char *func);
+#endif
+
 inline void (*SGLookupFunction(const char *func))() {
 
-#if defined( WIN32 )
+#if defined( WIN32 ) && !defined(__CYGWIN__) && !defined(__MINGW32__)
         return (void (*)()) wglGetProcAddress(func);
 
+#elif defined( __APPLE__ )
+       return (void (*)()) macosxGetGLProcAddress(func);
 #else
 
   // If the target system s UNIX and the ARB_get_proc_address
   // GLX extension is *not* guaranteed to be supported. An alternative
   // dlsym-based approach will be used instead.
-  #if defined( linux ) || defined ( sgi )
+  #if defined( linux ) || defined ( sgi ) || defined(__CYGWIN__) || defined(__MINGW32__)
         void *libHandle;
         void (*fptr)();
         libHandle = dlopen("libGL.so", RTLD_LAZY);
@@ -63,6 +77,16 @@ inline void (*SGLookupFunction(const char *func))() {
 
 
 /* OpenGL extension declarations */
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT                                   0x8126
+#define GL_DISTANCE_ATTENUATION_EXT                             0x8129
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB                                  0x8126
+#define GL_DISTANCE_ATTENUATION_ARB                            0x8129
+#endif
+
 typedef void (APIENTRY * glPointParameterfProc)(GLenum pname, GLfloat param);
 typedef void (APIENTRY * glPointParameterfvProc)(GLenum pname, const GLfloat *params);