set /sim/fg-current to current working directory; getcwd() is defined in

[flightgear.git] / src / Main / fg_os_osgviewer.cxx

diff --git a/src/Main/fg_os_osgviewer.cxx b/src/Main/fg_os_osgviewer.cxx
index 3a1685ac6fb5b9635bcce636c3c1b404f11d01c7..ccc26324bf17b0fce1b85ff585031f17c73a671b 100644 (file)
--- a/src/Main/fg_os_osgviewer.cxx
+++ b/src/Main/fg_os_osgviewer.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdlib.h>
 
 #include <simgear/compiler.h>
@@ -9,7 +14,7 @@
 #include <osg/Matrixd>
 #include <osg/Viewport>
 #include <osg/Version>
-#include <osgViewer/StatsHandler>
+#include <osgViewer/ViewerEventHandlers>
 #include <osgViewer/Viewer>
 #include <osgGA/MatrixManipulator>
 
@@ -19,7 +24,8 @@
 #include "globals.hxx"
 #include "renderer.hxx"
 
-#if ((1 == OSG_VERSION_MAJOR) && (9 == OSG_VERSION_MINOR) && \
+#if ((2 <= OSG_VERSION_MAJOR) || \
+     (1 == OSG_VERSION_MAJOR) && (9 == OSG_VERSION_MINOR) &&   \
      (8 <= OSG_VERSION_PATCH)) || \
     ((1 == OSG_VERSION_MAJOR) && (9 < OSG_VERSION_MINOR)) ||      \
     (1 < OSG_VERSION_MAJOR)