Wire in the balloon sim.

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 72acdb50000057492822710a88ae27f6002e1b81..5fac9633a0f37d1cd0fbb151cd90c59daab91f43 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -36,6 +36,7 @@ fgfs_LDADD = \
        $(top_builddir)/Simulator/Cockpit/libCockpit.a \
        $(top_builddir)/Simulator/Controls/libControls.a \
        $(top_builddir)/Simulator/FDM/libFlight.a \
+       $(top_builddir)/Simulator/FDM/Balloon/libBalloon.a \
        $(top_builddir)/Simulator/FDM/External/libExternal.a \
        $(top_builddir)/Simulator/FDM/JSBsim/libJSBsim.a \
        $(top_builddir)/Simulator/FDM/LaRCsim/libLaRCsim.a \

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 1b19c9d4c2b69845628b8196f1942f5dbd2d1c33..84a7d693b1ee160baa636f7c29104e5887a02167 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -56,7 +56,7 @@
 #include <Astro/solarsystem.hxx>
 #include <Autopilot/autopilot.hxx>
 #include <Cockpit/cockpit.hxx>
-// #include <FDM/Balloon.h>
+#include <FDM/Balloon.h>
 #include <FDM/JSBsim.hxx>
 #include <FDM/LaRCsim.hxx>
 #include <FDM/MagicCarpet.hxx>
@@ -232,9 +232,9 @@ bool fgInitSubsystems( void ) {
        cur_fdm_state = new FGLaRCsim;
     } else if ( current_options.get_flight_model() == FGInterface::FG_JSBSIM ) {
        cur_fdm_state = new FGJSBsim;
-    // } else if ( current_options.get_flight_model() == 
-    //             FGInterface::FG_BALLOONSIM ) {
-    //     cur_fdm_state = new FGBalloonSim;
+    } else if ( current_options.get_flight_model() == 
+               FGInterface::FG_BALLOONSIM ) {
+       cur_fdm_state = new FGBalloonSim;
     } else if ( current_options.get_flight_model() == 
                FGInterface::FG_MAGICCARPET ) {
        cur_fdm_state = new FGMagicCarpet;