Compile latest SimGear under MSVC9

diff --git a/projects/VC7.1/SimGear.vcproj b/projects/VC7.1/SimGear.vcproj
index 2824ccf037608e026beee3547eed316d4c141eef..1c1bb2c867637e63ceb3da3871916cc6fdfb52ef 100755 (executable)
--- a/projects/VC7.1/SimGear.vcproj
+++ b/projects/VC7.1/SimGear.vcproj
@@ -800,46 +800,49 @@
                        Name="Lib_sgmaterial"
                        Filter="">
                        <File
-                               RelativePath="..\..\simgear\scene\material\mat.cxx">
+                               RelativePath="..\..\simgear\scene\material\Effect.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\mat.hxx">
+                               RelativePath="..\..\simgear\scene\material\Effect.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\matlib.cxx">
+                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\matlib.hxx">
+                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\matmodel.cxx">
+                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\matmodel.hxx">
+                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\Effect.cxx">
+                               RelativePath="..\..\simgear\scene\material\GLPredicate.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\Effect.hxx">
+                               RelativePath="..\..\simgear\scene\material\GLPredicate.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.cxx">
+                               RelativePath="..\..\simgear\scene\material\makeEffect.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.hxx">
+                               RelativePath="..\..\simgear\scene\material\mat.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx">
+                               RelativePath="..\..\simgear\scene\material\mat.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx">
+                               RelativePath="..\..\simgear\scene\material\matlib.cxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\GLPredicate.cxx">
+                               RelativePath="..\..\simgear\scene\material\matlib.hxx">
                        </File>
                        <File
-                               RelativePath="..\..\simgear\scene\material\GLPredicate.hxx">
+                               RelativePath="..\..\simgear\scene\material\matmodel.cxx">
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\matmodel.hxx">
                        </File>
                        <File
                                RelativePath="..\..\simgear\scene\material\Pass.cxx">
@@ -853,9 +856,6 @@
                        <File
                                RelativePath="..\..\simgear\scene\material\Technique.hxx">
                        </File>
-                       <File
-                               RelativePath="..\..\simgear\scene\material\makeEffect.cxx">
-                       </File>
                </Filter>
                <Filter
                        Name="Lib_sgtgdb"

diff --git a/projects/VC90/SimGear.vcproj b/projects/VC90/SimGear.vcproj
index e2ada711035be57ee940767fda37029bfedd6bf6..ab67e8480291163720767362723e717f736b9bcf 100644 (file)
--- a/projects/VC90/SimGear.vcproj
+++ b/projects/VC90/SimGear.vcproj
@@ -1187,6 +1187,42 @@
                <Filter
                        Name="Lib_sgmaterial"
                        >
+                       <File
+                               RelativePath="..\..\simgear\scene\material\Effect.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\Effect.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\EffectCullVisitor.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\EffectGeode.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\EffectGeode.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\GLPredicate.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\GLPredicate.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\makeEffect.cxx"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\simgear\scene\material\mat.cxx"
                                >
@@ -1211,6 +1247,22 @@
                                RelativePath="..\..\simgear\scene\material\matmodel.hxx"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\Pass.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\Pass.hxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\Technique.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\simgear\scene\material\Technique.hxx"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Lib_sgtgdb"

diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx
index 2b6824f26b247906887d502153e83469881b5e10..9d301c86b849bb96a7866b00063afe9b4b1d8369 100644 (file)
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -22,6 +22,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
 
 #include <simgear/compiler.h>
 
@@ -33,6 +36,8 @@
 
 #include "interpolater.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 using std::string;
 
 // Constructor -- starts with an empty table.

diff --git a/simgear/misc/interpolator.cxx b/simgear/misc/interpolator.cxx
index 8720088ea4eaddf0ff382b1fe92374542b71e5ff..4e3980683c0db54eaa51327d501ed3510b350fe1 100644 (file)
--- a/simgear/misc/interpolator.cxx
+++ b/simgear/misc/interpolator.cxx
@@ -18,6 +18,8 @@
 
 #include "interpolator.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 void SGInterpolator::addNew(SGPropertyNode* prop, int nPoints)
 {
     // Set the property type to a double, if it isn't already, and

diff --git a/simgear/props/condition.cxx b/simgear/props/condition.cxx
index 6f4d235fa8a77bbf826ca2764dbeaccf923d7a44..d563fee345f60d6ba86a91dcb97e9bf5e9076673 100644 (file)
--- a/simgear/props/condition.cxx
+++ b/simgear/props/condition.cxx
@@ -8,7 +8,7 @@
 // $Id$
 
 #ifdef HAVE_CONFIG_H
-#  include <simgear/compiler.h>
+#  include <simgear_config.h>
 #endif
 
 // #include <iostream>
@@ -18,6 +18,8 @@
 #include "props.hxx"
 #include "condition.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 using std::istream;
 using std::ostream;
 

diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx
index f15c10ca006e58b83d6c1fb68b9655e56d0eb7ec..9524e78e47a90ed6194965c2f9f0ec401e8dd2e3 100644 (file)
--- a/simgear/props/props.cxx
+++ b/simgear/props/props.cxx
@@ -6,6 +6,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "props.hxx"
 
 #include <algorithm>

diff --git a/simgear/scene/bvh/BVHLineSegmentVisitor.cxx b/simgear/scene/bvh/BVHLineSegmentVisitor.cxx
index 7ba9a9444db69f56e61658702e134343b7aedfb7..d8ac44f9ad9248b1b83979c2668c72975e8d74a1 100644 (file)
--- a/simgear/scene/bvh/BVHLineSegmentVisitor.cxx
+++ b/simgear/scene/bvh/BVHLineSegmentVisitor.cxx
@@ -15,6 +15,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
+#include <simgear/Math/SGMath.hxx>
 #include "BVHLineSegmentVisitor.hxx"
 
 #include <simgear/math/SGGeometry.hxx>

diff --git a/simgear/scene/material/Effect.cxx b/simgear/scene/material/Effect.cxx
index 1c465700ad5d936202746e74cf6f019b0b7a5ef5..a50dfd7811a24577f60c56eb098c0dd59a01328c 100644 (file)
--- a/simgear/scene/material/Effect.cxx
+++ b/simgear/scene/material/Effect.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 <simgear_config.h>
+#endif
+
 #include "Effect.hxx"
 #include "Technique.hxx"
 #include "Pass.hxx"

diff --git a/simgear/scene/material/EffectCullVisitor.cxx b/simgear/scene/material/EffectCullVisitor.cxx
index dec2b1bdef69c388d78da3f349d658eb009c815d..a1a4fa821393f6720ebc7a2620a6c4cd066ea262 100644 (file)
--- a/simgear/scene/material/EffectCullVisitor.cxx
+++ b/simgear/scene/material/EffectCullVisitor.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 <simgear_config.h>
+#endif
+
 #include <osg/StateSet>
 
 #include "EffectCullVisitor.hxx"

diff --git a/simgear/scene/material/EffectGeode.cxx b/simgear/scene/material/EffectGeode.cxx
index 78b17ac08046629bb91f6a19ddbff1459a49de2e..799b567c76a8adf5b7399ae1c8cab6cdd265051a 100644 (file)
--- a/simgear/scene/material/EffectGeode.cxx
+++ b/simgear/scene/material/EffectGeode.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 <simgear_config.h>
+#endif
+
 #include "EffectGeode.hxx"
 #include "Effect.hxx"
 #include "Technique.hxx"

diff --git a/simgear/scene/material/Technique.cxx b/simgear/scene/material/Technique.cxx
index a49951e6566eaa2f66a04e1d2c15921fff509ee8..b8ceaa59ddfa6f641e6196a8c5922334004df65b 100644 (file)
--- a/simgear/scene/material/Technique.cxx
+++ b/simgear/scene/material/Technique.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "Technique.hxx"
 #include "Pass.hxx"
 

diff --git a/simgear/scene/material/makeEffect.cxx b/simgear/scene/material/makeEffect.cxx
index f437c460544455f7ff269aaa375154d84e1f304e..913fcfbd6072f101a5ab7a420980a1f6da0555d6 100644 (file)
--- a/simgear/scene/material/makeEffect.cxx
+++ b/simgear/scene/material/makeEffect.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "Effect.hxx"
 #include "Technique.hxx"
 #include "Pass.hxx"

diff --git a/simgear/scene/model/CheckSceneryVisitor.cxx b/simgear/scene/model/CheckSceneryVisitor.cxx
index d6fdd129d9dc4e1903c1005fd1a5adb19061d5c8..cc47117609fa691faa5b3a261463a843013e4959 100644 (file)
--- a/simgear/scene/model/CheckSceneryVisitor.cxx
+++ b/simgear/scene/model/CheckSceneryVisitor.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 <simgear_config.h>
+#endif
+
 #include <osg/Transform>
 
 #include <simgear/debug/logstream.hxx>
@@ -21,6 +25,8 @@
 #include "CheckSceneryVisitor.hxx"
 #include "SGPagedLOD.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 using namespace simgear;
 
 CheckSceneryVisitor::CheckSceneryVisitor(osgDB::DatabasePager* dbp, osg::Vec3 &position, double range)

diff --git a/simgear/scene/model/SGPagedLOD.cxx b/simgear/scene/model/SGPagedLOD.cxx
index 88777b8043fc50fee914d35fc27803197ee3d925..37cc4e5c1dad0f0722b4e73e6d57cfc473c6e644 100644 (file)
--- a/simgear/scene/model/SGPagedLOD.cxx
+++ b/simgear/scene/model/SGPagedLOD.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 <simgear_config.h>
+#endif
+
 #include <osgDB/ReadFile>
 
 #include <simgear/debug/logstream.hxx>
@@ -23,6 +27,8 @@
 #include "SGReaderWriterXMLOptions.hxx"
 #include "SGPagedLOD.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 using namespace osg;
 using namespace simgear;
 

diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx
index b431754795247e645ede551a929295bcd3990a83..e5b5a744e680cd63e1a70c2de1771f78a6580a41 100644 (file)
--- a/simgear/scene/model/modellib.cxx
+++ b/simgear/scene/model/modellib.cxx
@@ -34,6 +34,8 @@
 
 #include "modellib.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 
 using namespace simgear;
 

diff --git a/simgear/scene/model/persparam.cxx b/simgear/scene/model/persparam.cxx
index e855152c7ed01900cab84de5c8f1c9594486c016..167c9a20a164844b7af71b1c6c06698dfdc86b0c 100755 (executable)
--- a/simgear/scene/model/persparam.cxx
+++ b/simgear/scene/model/persparam.cxx
@@ -2,9 +2,15 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/props/props.hxx>
 #include "persparam.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 template <> double
 SGPersonalityParameter<double>::getNodeValue( const SGPropertyNode *props,
                                               const char *name,

diff --git a/simgear/structure/SGBinding.cxx b/simgear/structure/SGBinding.cxx
index e65b4d2a8bf584a3928f9f06bd1605e7b1f8e17b..35d2ec0ec1421e739723efb33be6f0a3ff34fee7 100644 (file)
--- a/simgear/structure/SGBinding.cxx
+++ b/simgear/structure/SGBinding.cxx
@@ -7,9 +7,15 @@
  * $Id$
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include "SGBinding.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 SGBinding::SGBinding()
   : _command(0),
     _arg(new SGPropertyNode),

diff --git a/simgear/structure/commands.cxx b/simgear/structure/commands.cxx
index 16706d96ecde648e8095fdb78cd2674ccbecd086..f0ec0daa19a68f0dd29e49f342a1c43b66d4ca79 100644 (file)
--- a/simgear/structure/commands.cxx
+++ b/simgear/structure/commands.cxx
@@ -4,6 +4,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <memory>
 #include <simgear/props/props_io.hxx>
 
@@ -12,6 +16,8 @@
 
 #include "commands.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 
 \f
 ////////////////////////////////////////////////////////////////////////

diff --git a/simgear/structure/event_mgr.cxx b/simgear/structure/event_mgr.cxx
index a62e83f91df7e26b94a7b42a2259eb02ef100b36..5384031aeb29b463a9c9b57d96420f100a484460 100644 (file)
--- a/simgear/structure/event_mgr.cxx
+++ b/simgear/structure/event_mgr.cxx
@@ -1,5 +1,7 @@
 #include "event_mgr.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 void SGEventMgr::add(SGCallback* cb,
                      double interval, double delay,
                      bool repeat, bool simtime)

diff --git a/simgear/structure/subsystem_mgr.cxx b/simgear/structure/subsystem_mgr.cxx
index 1385d8eab493a5181e2b94f837be431bfeb22eb4..1b8e18245acf7627b1a802f0bc73fe5d66afe334 100644 (file)
--- a/simgear/structure/subsystem_mgr.cxx
+++ b/simgear/structure/subsystem_mgr.cxx
@@ -5,6 +5,8 @@
 #include "exception.hxx"
 #include "subsystem_mgr.hxx"
 
+#include <simgear/Math/SGMath.hxx>
+
 
 \f
 ////////////////////////////////////////////////////////////////////////