Interim windows build fix

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

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index ebcb6bb7f21cb32cdf9f5e8eaab687385b0fe8b3..996c05fa9205da94d999dce4a4ba20912af96aa8 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -54,6 +54,7 @@ extern bool global_crashRptEnabled;
 #include <simgear/math/SGMath.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/misc/strutils.hxx>
+#include <simgear/scene/tgdb/GroundLightManager.hxx>
 
 #include <Model/panelnode.hxx>
 #include <Scenery/scenery.hxx>
@@ -67,7 +68,6 @@ extern bool global_crashRptEnabled;
 #include <Viewer/WindowSystemAdapter.hxx>
 #include <Navaids/NavDataCache.hxx>
 #include <Include/version.h>
-#include <Viewer/WindowBuilder.hxx>
 
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
@@ -82,7 +82,6 @@ extern bool global_crashRptEnabled;
 #include "options.hxx"
 
 #if defined(HAVE_QT)
-#include <QApplication>
 #include <GUI/QtLauncher.hxx>
 #endif
 
@@ -128,7 +127,7 @@ static void initTerrasync()
     
     // start TerraSync up now, so it can be synchronizing shared models
     // and airports data in parallel with a nav-cache rebuild.
-    SGPath tsyncCache(globals->get_fg_home());
+    SGPath tsyncCache(terraSyncDir);
     tsyncCache.append("terrasync-cache.xml");
     
     // wipe the cache file if requested
@@ -222,10 +221,7 @@ static void fgIdleFunction ( void ) {
         if (done) {
           ++idle_state;
           fgSplashProgress("init-scenery");
-        } else {
-          fgSplashProgress("loading-nav-dat");
         }
-      
     } else if ( idle_state == 4 ) {
         idle_state++;
 
@@ -264,10 +260,10 @@ static void fgIdleFunction ( void ) {
         // Initialize the TG scenery subsystem.
         ////////////////////////////////////////////////////////////////////
         
-        globals->set_scenery( new FGScenery );
+        globals->add_new_subsystem<FGScenery>(SGSubsystemMgr::DISPLAY);
         globals->get_scenery()->init();
         globals->get_scenery()->bind();
-        globals->set_tile_mgr( new FGTileMgr );
+        globals->add_new_subsystem<FGTileMgr>(SGSubsystemMgr::DISPLAY);
         
         fgSplashProgress("creating-subsystems");
     } else if (( idle_state == 7 ) || (idle_state == 2007)) {
@@ -414,12 +410,7 @@ int fgMainInit( int argc, char **argv )
         logToFile();
     }
     
-    std::string version;
-#ifdef FLIGHTGEAR_VERSION
-    version = FLIGHTGEAR_VERSION;
-#else
-    version = "unknown version";
-#endif
+    std::string version(FLIGHTGEAR_VERSION);
     SG_LOG( SG_GENERAL, SG_INFO, "FlightGear:  Version "
             << version );
     SG_LOG( SG_GENERAL, SG_INFO, "Built with " << SG_COMPILER_STR);
@@ -432,7 +423,7 @@ int fgMainInit( int argc, char **argv )
     string_list *col = new string_list;
     globals->set_channel_options_list( col );
 
-    fgValidatePath("", false);  // initialize static variables
+    fgValidatePath(globals->get_fg_home(), false);  // initialize static variables
     upper_case_property("/sim/presets/airport-id");
     upper_case_property("/sim/presets/runway");
     upper_case_property("/sim/tower/airport-id");
@@ -457,17 +448,9 @@ int fgMainInit( int argc, char **argv )
     // environment variables. This avoids needed a wrapper shell-script on OS-X.
     showLauncher |= (::getenv("FG_LAUNCHER") != 0);
 
-    if (showLauncher) {        
-        QApplication app(argc, argv);
-        app.setOrganizationName("FlightGear");
-        app.setApplicationName("FlightGear");
-        app.setOrganizationDomain("flightgear.org");
-    
-        // avoid double Apple menu and other weirdness if both Qt and OSG
-        // try to initialise various Cocoa structures.
-        flightgear::WindowBuilder::setPoseAsStandaloneApp(false);
-
-        if (!QtLauncher::runLauncherDialog()) {
+    if (showLauncher) {
+        flightgear::initApp(argc, argv);
+        if (!flightgear::runLauncherDialog()) {
             return EXIT_SUCCESS;
         }
     }
@@ -529,6 +512,9 @@ int fgMainInit( int argc, char **argv )
     // delete the NavCache here. This will cause the destruction of many cached
     // objects (eg, airports, navaids, runways).
     delete flightgear::NavDataCache::instance();
+    simgear::GroundLightManager::instance()->getRunwayLightStateSet()->clear();
+    simgear::GroundLightManager::instance()->getTaxiLightStateSet()->clear();
+    simgear::GroundLightManager::instance()->getGroundLightStateSet()->clear();
   
     return result;
 }