Fixes for headless mode.

diff --git a/simgear/math/SGGeod.cxx b/simgear/math/SGGeod.cxx
index 15468707dc4034ef7ad9ca959511aaf4438e7ba9..20fa1938369307f92e02a66a3d4358f1e87088b2 100644 (file)
--- a/simgear/math/SGGeod.cxx
+++ b/simgear/math/SGGeod.cxx
@@ -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

diff --git a/simgear/math/project.cxx b/simgear/math/project.cxx
index f1c2b143361c80a32bd949187559a2f7964bfa01..c6a4ef7337648f17812205dac80f69878ca04617 100644 (file)
--- a/simgear/math/project.cxx
+++ b/simgear/math/project.cxx
@@ -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
+

diff --git a/simgear/math/project.hxx b/simgear/math/project.hxx
index 40353a2da1a228bb39121cfd4addb17d95ef6eb8..07a97d79934e202e6c81e44f50d90f02c6adb951 100644 (file)
--- a/simgear/math/project.hxx
+++ b/simgear/math/project.hxx
@@ -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
+

diff --git a/simgear/misc/PathOptions.cxx b/simgear/misc/PathOptions.cxx
index 32c719d63c4ffb36fc674a5bbbbbfffa461d613f..b81600d87c1c4f99e1cd409e473641fdd09365f1 100644 (file)
--- a/simgear/misc/PathOptions.cxx
+++ b/simgear/misc/PathOptions.cxx
@@ -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

diff --git a/simgear/misc/PathOptions.hxx b/simgear/misc/PathOptions.hxx
index 9b14d6e8aa07ec65fcb4db9ef705024df276346e..8d4186a71253eaeb12b7be5fefad7ced7f9e1cfb 100644 (file)
--- a/simgear/misc/PathOptions.hxx
+++ b/simgear/misc/PathOptions.hxx
@@ -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

diff --git a/simgear/misc/interpolator.cxx b/simgear/misc/interpolator.cxx
index 2e902cae09841873ec2e14a2eb1295b442a95d16..04a898cc739b90e1d17636acdf2971bb7f8fbc3a 100644 (file)
--- a/simgear/misc/interpolator.cxx
+++ b/simgear/misc/interpolator.cxx
@@ -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>

diff --git a/simgear/props/propertyObject_test.cxx b/simgear/props/propertyObject_test.cxx
index 5bb4ae58b8ef3c715a46cceda353bb8c8fffad2d..b07bb4833b1bf4b27175b3bb8e92b50df705c07f 100644 (file)
--- a/simgear/props/propertyObject_test.cxx
+++ b/simgear/props/propertyObject_test.cxx
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
 
 #include <simgear/compiler.h>
 

diff --git a/simgear/props/props_test.cxx b/simgear/props/props_test.cxx
index cd54ec501e816a3892e39c5603b55c3c98af5bcd..f8299263a1252f58753a99e25139eee9385243db 100644 (file)
--- a/simgear/props/props_test.cxx
+++ b/simgear/props/props_test.cxx
@@ -3,6 +3,10 @@
 // Test harness.
 ////////////////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #include <iostream>

diff --git a/simgear/structure/Singleton.hxx b/simgear/structure/Singleton.hxx
index 0c3a59461b516d6d65abf8bde24c161838ec02c8..cc98c497633a7d754f910af66d151a8995b6325a 100644 (file)
--- a/simgear/structure/Singleton.hxx
+++ b/simgear/structure/Singleton.hxx
@@ -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

diff --git a/simgear/structure/event_mgr.cxx b/simgear/structure/event_mgr.cxx
index 11b34b7a1e6ce05533b067913c522788ce6367d4..f448a6495bd063c951b357e070c730cee29ce878 100644 (file)
--- a/simgear/structure/event_mgr.cxx
+++ b/simgear/structure/event_mgr.cxx
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "event_mgr.hxx"
 
 #include <simgear/math/SGMath.hxx>

diff --git a/simgear/structure/subsystem_mgr.cxx b/simgear/structure/subsystem_mgr.cxx
index 39598abeb8f3cb83768ca92309217bff382f9907..a59d6ef086f9ac4291c878187c38e14deede6f85 100644 (file)
--- a/simgear/structure/subsystem_mgr.cxx
+++ b/simgear/structure/subsystem_mgr.cxx
@@ -18,6 +18,10 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/timing/timestamp.hxx>
 

diff --git a/simgear/timing/timezone.cxx b/simgear/timing/timezone.cxx
index 7f09e6c6796e5896a2456ee13380887a32f41f5e..118849184b40e3b493d2250ce31e221e443f5858 100644 (file)
--- a/simgear/timing/timezone.cxx
+++ b/simgear/timing/timezone.cxx
@@ -26,6 +26,10 @@
  *
  ************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>