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 160906fffdb3e2341c31b49191a5f33d4a3c07e5..1231ae1b8666ff94752f775582aaa0f9c1822eff 100644 (file)
--- 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 c32de55dd35338441a2746007045630275c92a97..fe3687d4b47e470ca612b45f9d145814d4bc4f5c 100644 (file)
--- 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 3c9b2a78499d2ec2b198c64f35059f440f36bbf9..8539b02883d702ff8c7878c4fafa33ab2c882718 100644 (file)
--- 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 665f670962109770deb6fc3dd27ca2a9fbfe489b..feeafca4ea7d05d6d5cbca9dfd018c226b26287f 100755 (executable)
--- 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