MSVC fixes

diff --git a/simgear/scene/sky/clouds3d/SkyCloud.cpp b/simgear/scene/sky/clouds3d/SkyCloud.cpp
index 1c51d7df49ad29969e323da1e23c984cc3bd49ab..0155de421a107f51a2b388f84a1893c9a652ee15 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyCloud.cpp
+++ b/simgear/scene/sky/clouds3d/SkyCloud.cpp
@@ -25,6 +25,14 @@
 // warning for truncation of template name for browse info
 #pragma warning( disable : 4786)
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
 #include <GL/glu.h>
 #include <plib/ul.h>
 

diff --git a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
index 62d87a6c29fc80876a74223bd8023f9970f088e1..a436a7dace73280ec5b94cec5d8c058978f3710c 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
+++ b/simgear/scene/sky/clouds3d/SkyRenderableInstanceCloud.cpp
@@ -20,6 +20,14 @@
  * Implementation of class SkyRenderableInstanceCloud.
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
 #include <GL/glu.h>
 
 #include "SkyUtil.hpp"

diff --git a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
index 8bf47cb26a146d1d46714518e2aa77bf6c8b4f52..9d123b5cbd986cddde190cccdc85b8add15e0f8a 100644 (file)
--- a/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
+++ b/simgear/scene/sky/clouds3d/SkyTextureManager.cpp
@@ -22,6 +22,14 @@
 
 #pragma warning( disable : 4786)
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
 #include <GL/glu.h>
 
 #include "SkyTextureManager.hpp"

diff --git a/simgear/scene/sky/clouds3d/camutils.cpp b/simgear/scene/sky/clouds3d/camutils.cpp
index 5363406078fa65cc8bb851f5f6dbd63b1952c6d1..2d099346a8f297c4b30f28e2320404a02238bcb5 100644 (file)
--- a/simgear/scene/sky/clouds3d/camutils.cpp
+++ b/simgear/scene/sky/clouds3d/camutils.cpp
@@ -20,9 +20,9 @@
 //============================================================================
 
 #include "camutils.hpp"
-#include <plane.hpp>
-#include <tri.hpp>
-#include <minmaxbox.hpp>
+#include "plane.hpp"
+#include "tri.hpp"
+#include "minmaxbox.hpp"
 
 //----------------------------------------------------------------------------
 // Given a camera's 8 corner vertices and its 6 side planes and a triangle ABC,