X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2FGLBitmaps.cxx;h=a490a4d0bdc3ff4262bee9b079c1093e98406d5b;hb=dc09a50472890ac706d3c76d8af34cc3682ada0c;hp=0e9544ce70df3a43b3f7b5c1f1b3dfadc00de30b;hpb=e2b4c0787a4398199ef2d35e05963acd58b7a04c;p=simgear.git

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 0e9544ce..a490a4d0 100755
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -2,8 +2,12 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
+#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#define WIN32
+#endif
+
+#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+# include <windows.h>
 #endif
 
 #include <stdio.h>
@@ -11,8 +15,9 @@
 #include <limits.h>
 #include <string.h>		// memcpy()
 
-#include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <simgear/compiler.h>
+
+#include SG_GL_H
 
 #include "GLBitmaps.h"