fly/flightgear
1
0
Fork 0
Code Activity

Moved main.o to beginning of link line.

Browse source 
Initialize navaid databases.
This commit is contained in:
curt 2000-04-24 23:51:26 +00:00
parent 56ad909452
commit 8f21c91edf
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Main/Makefile.am
View file

@ -32,11 +32,11 @@ bin_PROGRAMS = fgfs
bin_SCRIPTS = runfgfs runfgfs.bat bin_SCRIPTS = runfgfs runfgfs.bat
fgfs_SOURCES = \ fgfs_SOURCES = \
main.cxx \
bfi.cxx bfi.hxx \ bfi.cxx bfi.hxx \
fg_init.cxx fg_init.hxx \ fg_init.cxx fg_init.hxx \
fg_io.cxx fg_io.hxx \ fg_io.cxx fg_io.hxx \
keyboard.cxx keyboard.hxx \ keyboard.cxx keyboard.hxx \
main.cxx \
options.cxx options.hxx \ options.cxx options.hxx \
save.cxx save.hxx \ save.cxx save.hxx \
splash.cxx splash.hxx \ splash.cxx splash.hxx \
@ -53,9 +53,11 @@ fgfs_LDADD = \
$(top_builddir)/src/FDM/libFlight.a \ $(top_builddir)/src/FDM/libFlight.a \
$(top_builddir)/src/FDM/Balloon/libBalloon.a \ $(top_builddir)/src/FDM/Balloon/libBalloon.a \
$(top_builddir)/src/FDM/JSBsim/libJSBsim.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/LaRCsim/libLaRCsim.a \
$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \ $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
$(top_builddir)/src/GUI/libGUI.a \ $(top_builddir)/src/GUI/libGUI.a \
$(top_builddir)/src/Navaids/libNavaids.a \
$(top_builddir)/src/Scenery/libScenery.a \ $(top_builddir)/src/Scenery/libScenery.a \
$(top_builddir)/src/Airports/libAirports.a \ $(top_builddir)/src/Airports/libAirports.a \
$(NETWORK_LIBS) \ $(NETWORK_LIBS) \

19
src/Main/fg_init.cxx
View file

@ -66,6 +66,9 @@
#include <FDM/MagicCarpet.hxx> #include <FDM/MagicCarpet.hxx>
#include <Include/general.hxx> #include <Include/general.hxx>
#include <Joystick/joystick.hxx> #include <Joystick/joystick.hxx>
#include <Navaids/fixlist.hxx>
#include <Navaids/ilslist.hxx>
#include <Navaids/navlist.hxx>
#include <Scenery/scenery.hxx> #include <Scenery/scenery.hxx>
#include <Scenery/tilemgr.hxx> #include <Scenery/tilemgr.hxx>
#include <Time/event.hxx> #include <Time/event.hxx>
@ -450,6 +453,22 @@ bool fgInitSubsystems( void ) {
current_weather.Init(); current_weather.Init();
#endif #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 // Initialize the Cockpit subsystem
if( fgCockpitInit( &current_aircraft )) { if( fgCockpitInit( &current_aircraft )) {
// Cockpit initialized ok. // Cockpit initialized ok.