From: david <david>
Date: Sun, 17 Nov 2002 00:42:17 +0000 (+0000)
Subject: Cygwin patch from Patrick Staehlin:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3f558b034beef618f9662f9717b72b0d1f666e0;p=simgear.git

Cygwin patch from Patrick Staehlin:

To compile the development CVS version of FlightGear(0.9.0) i had to
apply some small changes to SimGear and FlightGear.

The changes need probably some additional ifdefs for other platforms but
since my linux-hd crashed i can't verify that.
---

diff --git a/simgear/scene/sky/clouds3d/SkyContext.hpp b/simgear/scene/sky/clouds3d/SkyContext.hpp
index 160906ff..1231ae1b 100644
--- a/simgear/scene/sky/clouds3d/SkyContext.hpp
+++ b/simgear/scene/sky/clouds3d/SkyContext.hpp
@@ -28,14 +28,12 @@
 
 // warning for truncation of template name for browse info
 // #pragma warning( disable : 4786)
-
 #include "SkySingleton.hpp"
-
-
+#include "compiler.h"
 #include <list>
 #include <map>
 #include <algorithm>
-
+#include "compiler.h"
 #ifdef WIN32
 # include "extgl.h"
 #else
diff --git a/simgear/scene/sky/clouds3d/SkyTexture.hpp b/simgear/scene/sky/clouds3d/SkyTexture.hpp
index c32de55d..fe3687d4 100644
--- a/simgear/scene/sky/clouds3d/SkyTexture.hpp
+++ b/simgear/scene/sky/clouds3d/SkyTexture.hpp
@@ -25,6 +25,10 @@
 
 // #pragma warning( disable : 4786 )
 
+#define __glext_h_
+#define __GLEXT_H_
+#define __glext_h_
+#define __GLEXT_H_
 #include <GL/glut.h>
 
 //------------------------------------------------------------------------------
diff --git a/simgear/scene/sky/clouds3d/SkyTextureState.cpp b/simgear/scene/sky/clouds3d/SkyTextureState.cpp
index 3c9b2a78..8539b028 100644
--- a/simgear/scene/sky/clouds3d/SkyTextureState.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureState.cpp
@@ -24,6 +24,8 @@
 #include "SkyTextureState.hpp"
 //#include "glvu.hpp"
 
+
+
 //------------------------------------------------------------------------------
 // Static initializations.
 //------------------------------------------------------------------------------
diff --git a/simgear/scene/sky/clouds3d/extgl.h b/simgear/scene/sky/clouds3d/extgl.h
index 665f6709..feeafca4 100755
--- a/simgear/scene/sky/clouds3d/extgl.h
+++ b/simgear/scene/sky/clouds3d/extgl.h
@@ -24,6 +24,12 @@
 #include <windows.h>
 #endif
 
+#define __glext_h_
+#define __GLEXT_H_
+
+#define __glext_h_
+#define __GLEXT_H_
+
 #include <GL/gl.h>
 
 #ifndef APIENTRY