From c3f558b034beef618f9662f9717b72b0d1f666e0 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 17 Nov 2002 00:42:17 +0000 Subject: [PATCH] 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. --- simgear/scene/sky/clouds3d/SkyContext.hpp | 6 ++---- simgear/scene/sky/clouds3d/SkyTexture.hpp | 4 ++++ simgear/scene/sky/clouds3d/SkyTextureState.cpp | 2 ++ simgear/scene/sky/clouds3d/extgl.h | 6 ++++++ 4 files changed, 14 insertions(+), 4 deletions(-) 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 #include #include - +#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 //------------------------------------------------------------------------------ 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 #endif +#define __glext_h_ +#define __GLEXT_H_ + +#define __glext_h_ +#define __GLEXT_H_ + #include #ifndef APIENTRY -- 2.39.5