From 19e716397136f25e11187bcc025d13eeaeac346c Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Sun, 11 Mar 2012 19:55:04 +0100
Subject: [PATCH] Compile with MSVC 9

---
 projects/VC90/terrasync/terrasync.vcproj     | 4 ++--
 src/FDM/LaRCsim/IO360.cxx                    | 4 ++++
 src/FDM/YASim/Airplane.cpp                   | 4 ++++
 src/FDM/YASim/ControlMap.cpp                 | 4 ++++
 src/FDM/YASim/FGFDM.cpp                      | 4 ++++
 src/FDM/YASim/Ground.cpp                     | 4 ++++
 src/FDM/YASim/Hitch.cpp                      | 4 ++++
 src/FDM/YASim/Model.cpp                      | 5 +++++
 src/Instrumentation/heading_indicator_dg.cxx | 4 ++++
 src/Instrumentation/mrg.cxx                  | 4 ++++
 src/Main/WindowBuilder.cxx                   | 4 ++++
 src/Systems/pitot.cxx                        | 4 ++++
 12 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/projects/VC90/terrasync/terrasync.vcproj b/projects/VC90/terrasync/terrasync.vcproj
index f14254aca..f452dc6b6 100644
--- a/projects/VC90/terrasync/terrasync.vcproj
+++ b/projects/VC90/terrasync/terrasync.vcproj
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include"
+				AdditionalIncludeDirectories="..\..\..\..\SimGear;..\..\..\..\install\msvc90\OpenSceneGraph\include;..\..\..\..\3rdParty\include;..\..\..\..\boost_1_44_0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NOMINMAX;HAVE_SVN_CLIENT_H;HAVE_LIBSVN_CLIENT_1;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ul_d.lib sg_d.lib net_d.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib"
+				AdditionalDependencies="winmm.lib ul_d.lib sg_d.lib net_d.lib ws2_32.lib libsvn_client-1.lib libsvn_diff-1.lib libsvn_delta-1.lib libsvn_ra-1.lib libsvn_subr-1.lib libsvn_wc-1.lib libapr-1.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\..\install\msvc90\OpenSceneGraph\lib;..\..\..\..\3rdParty\lib"
 				GenerateDebugInformation="true"
diff --git a/src/FDM/LaRCsim/IO360.cxx b/src/FDM/LaRCsim/IO360.cxx
index 00acb23e6..17cd329ee 100644
--- a/src/FDM/LaRCsim/IO360.cxx
+++ b/src/FDM/LaRCsim/IO360.cxx
@@ -19,6 +19,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/compiler.h>
 
 #include <math.h>
diff --git a/src/FDM/YASim/Airplane.cpp b/src/FDM/YASim/Airplane.cpp
index 50ceefefd..15fd4d683 100644
--- a/src/FDM/YASim/Airplane.cpp
+++ b/src/FDM/YASim/Airplane.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "Atmosphere.hpp"
 #include "ControlMap.hpp"
 #include "Gear.hpp"
diff --git a/src/FDM/YASim/ControlMap.cpp b/src/FDM/YASim/ControlMap.cpp
index cb143f02d..c300c4c75 100644
--- a/src/FDM/YASim/ControlMap.cpp
+++ b/src/FDM/YASim/ControlMap.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "Jet.hpp"
 #include "Thruster.hpp"
 #include "PropEngine.hpp"
diff --git a/src/FDM/YASim/FGFDM.cpp b/src/FDM/YASim/FGFDM.cpp
index 8ce87f528..9f4217800 100644
--- a/src/FDM/YASim/FGFDM.cpp
+++ b/src/FDM/YASim/FGFDM.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/FDM/YASim/Ground.cpp b/src/FDM/YASim/Ground.cpp
index 32313f343..30d8583a4 100644
--- a/src/FDM/YASim/Ground.cpp
+++ b/src/FDM/YASim/Ground.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "Glue.hpp"
 
 #include <simgear/scene/material/mat.hxx>
diff --git a/src/FDM/YASim/Hitch.cpp b/src/FDM/YASim/Hitch.cpp
index c4bb871fa..45f9bd9f2 100644
--- a/src/FDM/YASim/Hitch.cpp
+++ b/src/FDM/YASim/Hitch.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "Math.hpp"
 #include "BodyEnvironment.hpp"
 #include "RigidBody.hpp"
diff --git a/src/FDM/YASim/Model.cpp b/src/FDM/YASim/Model.cpp
index 80f7a8dee..b92aea504 100644
--- a/src/FDM/YASim/Model.cpp
+++ b/src/FDM/YASim/Model.cpp
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "Atmosphere.hpp"
 #include "Thruster.hpp"
 #include "Math.hpp"
diff --git a/src/Instrumentation/heading_indicator_dg.cxx b/src/Instrumentation/heading_indicator_dg.cxx
index d44e0b036..303f84746 100644
--- a/src/Instrumentation/heading_indicator_dg.cxx
+++ b/src/Instrumentation/heading_indicator_dg.cxx
@@ -6,6 +6,10 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
 #include <iostream>
diff --git a/src/Instrumentation/mrg.cxx b/src/Instrumentation/mrg.cxx
index 247ffe5fe..6a6867b9d 100644
--- a/src/Instrumentation/mrg.cxx
+++ b/src/Instrumentation/mrg.cxx
@@ -6,6 +6,10 @@
 // TODO:
 // - better spin-up
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
 
diff --git a/src/Main/WindowBuilder.cxx b/src/Main/WindowBuilder.cxx
index 6ae1c067a..239a5e675 100644
--- a/src/Main/WindowBuilder.cxx
+++ b/src/Main/WindowBuilder.cxx
@@ -14,6 +14,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "WindowBuilder.hxx"
 
 #include "WindowSystemAdapter.hxx"
diff --git a/src/Systems/pitot.cxx b/src/Systems/pitot.cxx
index 535caa09d..b367283b2 100644
--- a/src/Systems/pitot.cxx
+++ b/src/Systems/pitot.cxx
@@ -3,6 +3,10 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/constants.h>
 
 #include <Main/fg_props.hxx>
-- 
2.39.5