Integrating YASim into the build system.

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 7f0cf1cb8da9956253b9fb3baec47830d637bb84..a6937492eaa27169bcf09983c2c5c56d246aea10 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -63,6 +63,7 @@ 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/YASim/libYASim.a \
        $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
        $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
        $(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 4632eb3133ec3372f5a3686b7022c776bebc3b2a..7080b616330c51f75a93ca299ad011d5671f1a7f 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -82,6 +82,7 @@
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
 #include <FDM/NullFDM.hxx>
+#include <FDM/YASim/YASim.hxx>
 #include <Include/general.hxx>
 #include <Input/input.hxx>
 // #include <Joystick/joystick.hxx>
@@ -560,6 +561,8 @@ bool fgInitSubsystems( void ) {
            cur_fdm_state = new FGExternal( dt );
        } else if (model == "null") {
            cur_fdm_state = new FGNullFDM( dt );
+       } else if (model == "yasim") {
+           cur_fdm_state = new YASim( dt );
        } else {
            SG_LOG(SG_GENERAL, SG_ALERT,
                   "Unrecognized flight model '" << model
@@ -934,6 +937,8 @@ void fgReInitSubsystems( void )
            cur_fdm_state = new FGExternal( dt );
        } else if (model == "null") {
            cur_fdm_state = new FGNullFDM( dt );
+       } else if (model == "yasim") {
+           cur_fdm_state = new YASim( dt );
        } else {
            SG_LOG(SG_GENERAL, SG_ALERT,
                   "Unrecognized flight model '" << model