fly/flightgear
1
0
Fork 0
Code Activity

Integrating YASim into the build system.

Browse source
This commit is contained in:
curt 2001-12-01 06:22:49 +00:00
parent 5b84ae51a5
commit 0d2d153914
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Main/Makefile.am
View file

@ -63,6 +63,7 @@ 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/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 \
$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \ $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \

5
src/Main/fg_init.cxx
View file

@ -82,6 +82,7 @@
#include <FDM/LaRCsim.hxx> #include <FDM/LaRCsim.hxx>
#include <FDM/MagicCarpet.hxx> #include <FDM/MagicCarpet.hxx>
#include <FDM/NullFDM.hxx> #include <FDM/NullFDM.hxx>
#include <FDM/YASim/YASim.hxx>
#include <Include/general.hxx> #include <Include/general.hxx>
#include <Input/input.hxx> #include <Input/input.hxx>
// #include <Joystick/joystick.hxx> // #include <Joystick/joystick.hxx>
@ -560,6 +561,8 @@ bool fgInitSubsystems( void ) {
cur_fdm_state = new FGExternal( dt ); cur_fdm_state = new FGExternal( dt );
} else if (model == "null") { } else if (model == "null") {
cur_fdm_state = new FGNullFDM( dt ); cur_fdm_state = new FGNullFDM( dt );
} else if (model == "yasim") {
cur_fdm_state = new YASim( dt );
} else { } else {
SG_LOG(SG_GENERAL, SG_ALERT, SG_LOG(SG_GENERAL, SG_ALERT,
"Unrecognized flight model '" << model "Unrecognized flight model '" << model
@ -934,6 +937,8 @@ void fgReInitSubsystems( void )
cur_fdm_state = new FGExternal( dt ); cur_fdm_state = new FGExternal( dt );
} else if (model == "null") { } else if (model == "null") {
cur_fdm_state = new FGNullFDM( dt ); cur_fdm_state = new FGNullFDM( dt );
} else if (model == "yasim") {
cur_fdm_state = new YASim( dt );
} else { } else {
SG_LOG(SG_GENERAL, SG_ALERT, SG_LOG(SG_GENERAL, SG_ALERT,
"Unrecognized flight model '" << model "Unrecognized flight model '" << model