Compile latest SimGear under MSVC9

This commit is contained in:
fredb
2009-07-26 18:53:29 +00:00
committed by Tim Moore
parent 59ef7d8fd1
commit efa2876e29
20 changed files with 146 additions and 22 deletions

View File

@@ -799,24 +799,6 @@
<Filter
Name="Lib_sgmaterial"
Filter="">
<File
RelativePath="..\..\simgear\scene\material\mat.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\mat.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matlib.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matlib.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matmodel.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matmodel.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\Effect.cxx">
</File>
@@ -841,6 +823,27 @@
<File
RelativePath="..\..\simgear\scene\material\GLPredicate.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\makeEffect.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\mat.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\mat.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matlib.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matlib.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matmodel.cxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\matmodel.hxx">
</File>
<File
RelativePath="..\..\simgear\scene\material\Pass.cxx">
</File>
@@ -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"

View File

@@ -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"

View File

@@ -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.

View File

@@ -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

View File

@@ -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;

View File

@@ -6,6 +6,10 @@
//
// $Id$
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include "props.hxx"
#include <algorithm>

View File

@@ -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>

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -1,3 +1,8 @@
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include "Technique.hxx"
#include "Pass.hxx"

View File

@@ -1,3 +1,8 @@
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include "Effect.hxx"
#include "Technique.hxx"
#include "Pass.hxx"

View File

@@ -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)

View File

@@ -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;

View File

@@ -34,6 +34,8 @@
#include "modellib.hxx"
#include <simgear/Math/SGMath.hxx>
using namespace simgear;

View File

@@ -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,

View File

@@ -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),

View File

@@ -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>
////////////////////////////////////////////////////////////////////////

View File

@@ -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)

View File

@@ -5,6 +5,8 @@
#include "exception.hxx"
#include "subsystem_mgr.hxx"
#include <simgear/Math/SGMath.hxx>
////////////////////////////////////////////////////////////////////////