Fix the header name change from sample_openal.hxx to sample.hxx

diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx
index b2b20c5c762799387f9e31db683fd4c7335ab1ac..a93844da44c657a514b7645546627ace51abca22 100644 (file)
--- a/src/FDM/JSBSim/JSBSim.cxx
+++ b/src/FDM/JSBSim/JSBSim.cxx
@@ -502,7 +502,7 @@ void FGJSBsim::unbind()
 /******************************************************************************/
 
 // Run an iteration of the EOM (equations of motion)
-
+#  include <fenv.h>
 void FGJSBsim::update( double dt )
 {
     if(crashed) {
@@ -1311,6 +1311,7 @@ bool FGJSBsim::update_ground_cache(const FGLocation& cart, double* cart_pos,
   // Compute the potential movement of this aircraft and query for the
   // ground in this area.
   double groundCacheRadius = acrad + 2*dt*Propagate->GetUVW().Magnitude();
+
   cart_pos[0] = cart(1);
   cart_pos[1] = cart(2);
   cart_pos[2] = cart(3);

diff --git a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
index a5f6e8e54dcb00c859f65951e6f2cca3ec77df7d..084c96567d076c48d13bc538e60865608c12db89 100644 (file)
--- a/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
+++ b/src/FDM/JSBSim/models/atmosphere/FGStandardAtmosphere.cpp
@@ -153,6 +153,9 @@ double FGStandardAtmosphere::GetPressure(double altitude) const
   double Lmb, Exp, Tmb, deltaH, factor;
   double numRows = StdAtmosTemperatureTable->GetNumRows();
 
+  if (altitude > 328084) // Karman line
+    altitude = 328084;
+
   // Iterate through the altitudes to find the current Base Altitude
   // in the table. That is, if the current altitude (the argument passed in)
   // is 20000 ft, then the base altitude from the table is 0.0. If the
@@ -176,7 +179,7 @@ double FGStandardAtmosphere::GetPressure(double altitude) const
     factor = Tmb/(Tmb + Lmb*deltaH);
     pressure = PressureBreakpointVector[b]*pow(factor, Exp);
   } else {
-    pressure = PressureBreakpointVector[b]*exp(-Mair*deltaH/(Rstar*Tmb));
+    pressure = PressureBreakpointVector[b]*exp(Mair*deltaH/(Rstar*Tmb));
   }
 
   return pressure;

diff --git a/src/Sound/VoiceSynthesizer.hxx b/src/Sound/VoiceSynthesizer.hxx
index 17fb4bc1ffabaa8564ba03791824b4e825c01198..246085d9b5f5971646cc2a97564f07095b671287 100644 (file)
--- a/src/Sound/VoiceSynthesizer.hxx
+++ b/src/Sound/VoiceSynthesizer.hxx
@@ -19,7 +19,7 @@
 #ifndef VOICESYNTHESIZER_HXX_
 #define VOICESYNTHESIZER_HXX_
 
-#include <simgear/sound/sample_openal.hxx>
+#include <simgear/sound/sample.hxx>
 #include <simgear/threads/SGQueue.hxx>
 
 #include <string>

diff --git a/src/Sound/beacon.cxx b/src/Sound/beacon.cxx
index 689922932b4bfb15a3a7321a2b146b5b7c14bb31..46f0013a443469817c3aac094b323608ff66e3cc 100644 (file)
--- a/src/Sound/beacon.cxx
+++ b/src/Sound/beacon.cxx
@@ -24,7 +24,7 @@
 
 #include "beacon.hxx"
 
-#include <simgear/sound/sample_openal.hxx>
+#include <simgear/sound/sample.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 

diff --git a/src/Sound/flitevoice.hxx b/src/Sound/flitevoice.hxx
index ee616e8ed8f2b0e6ed569537c319ca6faaf735dc..1b95547fa86ceadb23d118ecc56695eec8a49496 100644 (file)
--- a/src/Sound/flitevoice.hxx
+++ b/src/Sound/flitevoice.hxx
@@ -25,7 +25,7 @@
 
 #include "voice.hxx"
 #include <simgear/sound/soundmgr_openal.hxx>
-#include <simgear/sound/sample_openal.hxx>
+#include <simgear/sound/sample.hxx>
 #include <simgear/threads/SGQueue.hxx>
 
 class VoiceSynthesizer;

diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx
index 1563841ab7fee87567a2a4a6e4464e4a7145a367..9e4d5eced34e1ad34899becceb494d31287ce116 100644 (file)
--- a/src/Sound/morse.cxx
+++ b/src/Sound/morse.cxx
@@ -24,7 +24,7 @@
 
 #include "morse.hxx"
 
-#include <simgear/sound/sample_openal.hxx>
+#include <simgear/sound/sample.hxx>
 
 #include <cstring>
 #include <stdlib.h>

diff --git a/src/Sound/sample_queue.cxx b/src/Sound/sample_queue.cxx
index f6a1a49b51dd33856572c4754f0ed9ccb1c4edf0..7295b341ce1f9ba9eb040d1fe2588be3f86dab30 100644 (file)
--- a/src/Sound/sample_queue.cxx
+++ b/src/Sound/sample_queue.cxx
@@ -34,7 +34,7 @@
 #include <Main/fg_props.hxx>
 
 #include <simgear/sound/soundmgr_openal.hxx>
-#include <simgear/sound/sample_openal.hxx>
+#include <simgear/sound/sample.hxx>
 
 FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) :
     last_enabled( true ),

diff --git a/utils/fgelev/CMakeLists.txt b/utils/fgelev/CMakeLists.txt
index 90b52c0016a4e79a403672f5b7a4db8d103af1ae..25756d5d7f822760f5266c142cbc22b16252b542 100644 (file)
--- a/utils/fgelev/CMakeLists.txt
+++ b/utils/fgelev/CMakeLists.txt
@@ -1,10 +1,12 @@
 add_executable(fgelev fgelev.cxx)
 
+message("SIMGEAR_LIBRARIES: ${SIMGEAR_LIBRARIES}")
 target_link_libraries(fgelev
        ${SIMGEAR_LIBRARIES}
        ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENGL_LIBRARIES}
         ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+        ${ZLIB_LIBRARY}
 )
 
 install(TARGETS fgelev RUNTIME DESTINATION bin)