Moved main.o to beginning of link line.

Initialize navaid databases.

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 43a0e60a8b04bd982b01940cd4ab2ad783e3838b..762f532362464427102f9f0907763963a66a5a42 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -32,11 +32,11 @@ bin_PROGRAMS = fgfs
 bin_SCRIPTS = runfgfs runfgfs.bat
 
 fgfs_SOURCES = \
+       main.cxx \
        bfi.cxx bfi.hxx \
        fg_init.cxx fg_init.hxx \
        fg_io.cxx fg_io.hxx \
        keyboard.cxx keyboard.hxx \
-       main.cxx \
        options.cxx options.hxx \
        save.cxx save.hxx \
        splash.cxx splash.hxx \
@@ -53,9 +53,11 @@ fgfs_LDADD = \
        $(top_builddir)/src/FDM/libFlight.a \
        $(top_builddir)/src/FDM/Balloon/libBalloon.a \
        $(top_builddir)/src/FDM/JSBsim/libJSBsim.a \
+       $(top_builddir)/src/FDM/JSBsim/filtersjb/libfiltersjb.a \
        $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
        $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
        $(top_builddir)/src/GUI/libGUI.a \
+       $(top_builddir)/src/Navaids/libNavaids.a \
        $(top_builddir)/src/Scenery/libScenery.a \
        $(top_builddir)/src/Airports/libAirports.a \
         $(NETWORK_LIBS) \

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 66920fc4b1d35f888064294c42370d9201ec9c3e..3bf3ff11fe413b939c5188429484de34897e1d3f 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -66,6 +66,9 @@
 #include <FDM/MagicCarpet.hxx>
 #include <Include/general.hxx>
 #include <Joystick/joystick.hxx>
+#include <Navaids/fixlist.hxx>
+#include <Navaids/ilslist.hxx>
+#include <Navaids/navlist.hxx>
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Time/event.hxx>
@@ -450,6 +453,22 @@ bool fgInitSubsystems( void ) {
     current_weather.Init();
 #endif
 
+    // Initialize vor/ndb/ils/fix list management and query systems
+    current_navlist = new FGNavList;
+    FGPath p_nav( current_options.get_fg_root() );
+    p_nav.append( "Navaids/default.nav" );
+    current_navlist->init( p_nav );
+
+    current_ilslist = new FGILSList;
+    FGPath p_ils( current_options.get_fg_root() );
+    p_ils.append( "Navaids/default.ils" );
+    current_ilslist->init( p_ils );
+
+    current_fixlist = new FGFixList;
+    FGPath p_fix( current_options.get_fg_root() );
+    p_fix.append( "Navaids/default.fix" );
+    current_fixlist->init( p_fix );
+
     // Initialize the Cockpit subsystem
     if( fgCockpitInit( &current_aircraft )) {
        // Cockpit initialized ok.