Add a function to calculate the normalmap from a regular texture.

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

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index 7c97bd60fbe69dbfb382c51a530591206990c7cc..4b9046a0c1e6316996d260cef51190924b5670de 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -24,7 +24,7 @@
 #ifndef __SG_EXTENSIONS_HXX
 #define __SG_EXTENSIONS_HXX 1
 
-#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#if defined(__CYGWIN__) && !defined(WIN32) /* && !defined(USING_X) */
 #define WIN32
 #endif
 
@@ -36,7 +36,9 @@
 # include <dlfcn.h>
 #endif
 
-#include <GL/gl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 
 #if defined(__cplusplus)
@@ -54,7 +56,7 @@ bool SGIsOpenGLExtensionSupported(char *extName);
   // don't use an inline function for symbol lookup, since it is too big
   void* macosxGetGLProcAddress(const char *func);
 
-#else if !defined( WIN32 )
+#elif !defined( WIN32 )
 
   void *SGGetGLProcAddress(const char *func);