FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for headless mode.

Browse Source
This commit is contained in:
James Turner 2011-10-23 17:56:28 +01:00
parent a31639682b
commit 6250f675db
12 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/math/SGGeod.cxx
View File

@ -15,6 +15,10 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include "SGMath.hxx"
#ifndef NO_OPENSCENEGRAPH_INTERFACE

9
simgear/math/project.cxx
View File

@ -15,8 +15,14 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include "project.hxx"
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osg/Math>
#include <osg/Matrixd>
@ -41,3 +47,6 @@ GLint project(GLdouble objX, GLdouble objY, GLdouble objZ,
}
}
#endif // of NO_OPENSCENEGRAPH_INTERFACE

7
simgear/math/project.hxx
View File

@ -16,6 +16,9 @@
//
#ifndef SIMGEAR_PROJECT_HXX
#define SIMGEAR_PROJECT_HXX 1
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osg/GL>
namespace simgear
@ -26,4 +29,8 @@ extern GLint project(GLdouble objX, GLdouble objY, GLdouble objZ,
const GLint *view,
GLdouble* winX, GLdouble* winY, GLdouble* winZ);
}
#endif // of NO_OPENSCENEGRAPH_INTERFACE
#endif

8
simgear/misc/PathOptions.cxx
View File

@ -17,6 +17,12 @@
//
// $Id$
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osgDB/Registry>
#include "PathOptions.hxx"
@ -31,3 +37,5 @@ osgDB::ReaderWriter::Options* simgear::makeOptionsFromPath(const SGPath& path)
options->setDatabasePath(path.str());
return options;
}
#endif // of NO_OPENSCENEGRAPH_INTERFACE

3
simgear/misc/PathOptions.hxx
View File

@ -20,6 +20,7 @@
#ifndef PATHOPTIONSHXX
#define PATHOPTIONSHXX 1
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osgDB/ReaderWriter>
#include <simgear/misc/sg_path.hxx>
@ -28,3 +29,5 @@ namespace simgear
osgDB::ReaderWriter::Options* makeOptionsFromPath(const SGPath&);
}
#endif
#endif

4
simgear/misc/interpolator.cxx
View File

@ -16,6 +16,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 "interpolator.hxx"
#include <simgear/math/SGMath.hxx>

3
simgear/props/propertyObject_test.cxx
View File

@ -1,3 +1,6 @@
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include <simgear/compiler.h>

4
simgear/props/props_test.cxx
View File

@ -3,6 +3,10 @@
// Test harness.
////////////////////////////////////////////////////////////////////////
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include <simgear/compiler.h>
#include <iostream>

5
simgear/structure/Singleton.hxx
View File

@ -3,8 +3,10 @@
#include <boost/pool/detail/singleton.hpp>
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osg/Referenced>
#include <osg/ref_ptr>
#endif
namespace simgear
{
@ -27,6 +29,7 @@ public:
}
};
#ifndef NO_OPENSCENEGRAPH_INTERFACE
template <typename RefClass>
class SingletonRefPtr
{
@ -54,5 +57,7 @@ public:
return SingletonRefPtr<RefClass>::instance();
}
};
#endif // of NO_OPENSCENEGRAPH_INTERFACE
}
#endif

4
simgear/structure/event_mgr.cxx
View File

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include "event_mgr.hxx"
#include <simgear/math/SGMath.hxx>

4
simgear/structure/subsystem_mgr.cxx
View File

@ -18,6 +18,10 @@
//
// $Id$
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include <simgear/debug/logstream.hxx>
#include <simgear/timing/timestamp.hxx>

4
simgear/timing/timezone.cxx
View File

@ -26,6 +26,10 @@
*
************************************************************************/
#ifdef HAVE_CONFIG_H
# include <simgear_config.h>
#endif
#include <errno.h>
#include <string.h>
#include <stdio.h>