Fixes for MSVC++.

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
 {

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;

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

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;

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>