Interim windows build fix

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

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index cd9fe75db6c6617932f68eb309d125172b949f2d..c0a955379b7b70cf72af4a5a9edf43bfa0a47382 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -851,7 +851,7 @@ fgOptRoc( const char *arg )
 static int
 fgOptFgScenery( const char *arg )
 {
-    globals->append_fg_scenery(arg);
+    globals->append_fg_scenery(arg, true);
     return FG_OPTIONS_OK;
 }
 
@@ -1328,6 +1328,7 @@ fgOptVersion( const char *arg )
     }
     cerr << endl;
     cerr << "SimGear version: " << SG_STRINGIZE(SIMGEAR_VERSION) << endl;
+    cerr << "OSG version: " << osgGetVersion() << endl;
     cerr << "PLIB version: " << PLIB_VERSION << endl;
     return FG_OPTIONS_EXIT;
 }
@@ -2278,7 +2279,7 @@ OptionResult Options::processOptions()
 // now options are process, do supplemental fixup
   const char *envp = ::getenv( "FG_SCENERY" );
   if (envp) {
-    globals->append_fg_scenery(envp);
+    globals->append_fg_scenery(envp, true);
   }
 
 // download dir fix-up
@@ -2512,7 +2513,7 @@ void Options::setupRoot(int argc, char **argv)
 
 #if defined(HAVE_QT)
     if (base_version != required_version) {
-        QtLauncher::initApp(argc, argv);
+        flightgear::initApp(argc, argv);
         if (SetupRootDialog::restoreUserSelectedRoot()) {
             SG_LOG(SG_GENERAL, SG_INFO, "restored user selected fg_root = " << globals->get_fg_root() );
             return;