fly/flightgear
1
0
Fork 0
Code Activity

Only test for --fg-root and --aircraft in ~/.fgfsrc et all if it wasn't specified at the command line.

Browse source
This commit is contained in:
ehofman 2005-12-22 14:14:08 +00:00
parent b788a204c4
commit 62c6063fa1
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/Makefile.am
View file

@ -25,6 +25,16 @@ else
GFX_CODE = fg_os.cxx fg_os.hxx GFX_CODE = fg_os.cxx fg_os.hxx
endif endif
JSBSIM_LIBS = \
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
$(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \
$(top_builddir)/src/FDM/JSBSim/models/libModels.a \
$(top_builddir)/src/FDM/JSBSim/models/flight_control/libFlightControl.a\
$(top_builddir)/src/FDM/JSBSim/models/atmosphere/libAtmosphere.a \
$(top_builddir)/src/FDM/JSBSim/models/propulsion/libPropulsion.a \
$(top_builddir)/src/FDM/JSBSim/input_output/libInputOutput.a \
$(top_builddir)/src/FDM/JSBSim/math/libMath.a
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\" AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\"
bin_PROGRAMS = fgfs metar bin_PROGRAMS = fgfs metar
@ -63,7 +73,7 @@ fgfs_LDADD = \
$(top_builddir)/src/FDM/Balloon/libBalloon.a \ $(top_builddir)/src/FDM/Balloon/libBalloon.a \
$(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \ $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \
$(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \ $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \ $(JSBSIM_LIBS) \
$(top_builddir)/src/FDM/YASim/libYASim.a \ $(top_builddir)/src/FDM/YASim/libYASim.a \
$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \ $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \ $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
@ -105,4 +115,4 @@ metar_LDADD = \
-lplibnet -lplibul $(network_LIBS) \ -lplibnet -lplibul $(network_LIBS) \
-lz $(base_LIBS) -lz $(base_LIBS)
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim

6
src/Main/fg_init.cxx
View file

@ -263,7 +263,8 @@ bool fgInitFGRoot ( int argc, char **argv ) {
root = fgScanForOption( "--fg-root=", argc, argv); root = fgScanForOption( "--fg-root=", argc, argv);
// Check in one of the user configuration files. // Check in one of the user configuration files.
root = fgScanForOption( "--fg-root=" ); if (root.empty() )
root = fgScanForOption( "--fg-root=" );
// Next check if fg-root is set as an env variable // Next check if fg-root is set as an env variable
if ( root.empty() ) { if ( root.empty() ) {
@ -323,7 +324,8 @@ bool fgInitFGAircraft ( int argc, char **argv ) {
aircraft = fgScanForOption( "--aircraft=", argc, argv ); aircraft = fgScanForOption( "--aircraft=", argc, argv );
// Check in one of the user configuration files. // Check in one of the user configuration files.
aircraft = fgScanForOption( "--aircraft=" ); if ( aircraft.empty() )
aircraft = fgScanForOption( "--aircraft=" );
// if an aircraft was specified, set the property name // if an aircraft was specified, set the property name
if ( !aircraft.empty() ) { if ( !aircraft.empty() ) {