Attempt to fix the Cygwin build problem for once and for all

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index f8b137022632cdbfd86289bed3799f586bd689cd..7caba76d46287819ae165a6f395f0448f1f9ab04 100755 (executable)
--- 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>

diff --git a/simgear/screen/extensions.hxx b/simgear/screen/extensions.hxx
index c6d6480a5b5b1ff72f47238ee6758e8d27a97ef7..cb7616798d031d939d47e4cfa5a04537d45e368a 100644 (file)
--- a/simgear/screen/extensions.hxx
+++ b/simgear/screen/extensions.hxx
@@ -24,12 +24,18 @@
 #ifndef __SG_EXTENSIONS_HXX
 #define __SG_EXTENSIONS_HXX 1
 
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# include <windows.h>
-#else
+#if !defined(WIN32)
 # include <dlfcn.h>
 #endif
 
+#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#define WIN32
+#endif
+
+#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+# include <windows.h>
+#endif
+
 #include <GL/gl.h>
 
 

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index 862fbdd1470d473a788da9b36aa62db33904a194..d6a62ba05b48e95160c25355e2610408d5316aff 100644 (file)
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -24,8 +24,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>

diff --git a/simgear/xgl/xgl.c b/simgear/xgl/xgl.c
index ae7a91f183ac43a165a19a9fa07d1ddbd8a3f979..2e7119575796041068e1563b8e6f7296896e3b42 100644 (file)
--- a/simgear/xgl/xgl.c
+++ b/simgear/xgl/xgl.c
@@ -2,10 +2,6 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
 #include "xgl.h"
 
 #ifdef USING_GLUT

diff --git a/simgear/xgl/xgl.h b/simgear/xgl/xgl.h
index 366cf4796d16ba4036cbccd56084dc2657631864..40a14fbfe97fd37573236f4acf5283bb6317aad9 100644 (file)
--- a/simgear/xgl/xgl.h
+++ b/simgear/xgl/xgl.h
@@ -6,8 +6,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 <GL/gl.h>