Fixes for MSVC++.

diff --git a/simgear/metar/MetarReport.h b/simgear/metar/MetarReport.h
index 06e09808f47bf8b1b86943aeaf0ecf108bb95a00..36c53c4b3bb0aee2994a15b7e31a3c986c03c1ff 100644 (file)
--- a/simgear/metar/MetarReport.h
+++ b/simgear/metar/MetarReport.h
@@ -10,8 +10,8 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <Math/point3d.hxx>
-#include <Math/polar3d.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 
 class CMetarReport
 {

diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index 451204ccf4501c8ccda19c22ff66c5058c7f3c1d..e5067923fbc46c9f5b52e90e7ea04f06efc2b38f 100644 (file)
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -9,7 +9,7 @@
 // options is too tightly integrated into FlightGear to use in a test program
 #include <Main/options.hxx>
 #endif
-#include <Misc/fgpath.hxx>
+#include <simgear/misc/fgpath.hxx>
 
 
 std::vector< CMetarStation *> METAR_Stations;

diff --git a/simgear/metar/MetarStation.h b/simgear/metar/MetarStation.h
index 299e5e175dc3215576a2b574d85bdc7c36b877ed..8169a9c9c9b9464f3236416fc66ba251b7446f2a 100644 (file)
--- a/simgear/metar/MetarStation.h
+++ b/simgear/metar/MetarStation.h
@@ -11,8 +11,8 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <Math/point3d.hxx>
-#include <Math/polar3d.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
 //using namespace std;
 
 class CMetarStation

diff --git a/simgear/misc/texcoord.cxx b/simgear/misc/texcoord.cxx
index 61efc23e7bd55d1c59c58f46c0856f72fd55f41c..789fd9d93742062b963face3036c91c80d7b467d 100644 (file)
--- a/simgear/misc/texcoord.cxx
+++ b/simgear/misc/texcoord.cxx
@@ -80,7 +80,9 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
     Point3D tmin, tmax, p, t;
     bool first = true;
 
-    for ( int i = 0; i < (int)fan.size(); ++i ) {
+    int i;
+
+    for ( i = 0; i < (int)fan.size(); ++i ) {
        p = geod_nodes[ fan[i] ];
        // cout << "point p = " << p << endl;
 
@@ -162,7 +164,7 @@ point_list calc_tex_coords( const FGBucket& b, const point_list& geod_nodes,
     Point3D adjusted_t;
     point_list tex;
     tex.clear();
-    for ( int i = 0; i < (int)fan.size(); ++i ) {
+    for ( i = 0; i < (int)fan.size(); ++i ) {
        p = geod_nodes[ fan[i] ];
        t = basic_tex_coord( p, degree_width, degree_height, scale );
        // cout << "second t = " << t << endl;

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index eef3e7ad023d091fe5730676f7d7586f052983c6..0edadf4189b47f142ff4b6afb29f4f202a16511d 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <string.h>            // memcpy()
 
 #include <GL/glut.h>
 #include <simgear/xgl/xgl.h>