Preparations for first v0.9.10 prerelease.
This commit is contained in:
parent
00efc0960f
commit
d5e57b8c1f
3 changed files with 6 additions and 4 deletions
|
@ -10,7 +10,7 @@ AC_PREREQ(2.52)
|
||||||
dnl Initialize the automake stuff
|
dnl Initialize the automake stuff
|
||||||
dnl set the $host variable based on local machine/os
|
dnl set the $host variable based on local machine/os
|
||||||
AC_CANONICAL_TARGET
|
AC_CANONICAL_TARGET
|
||||||
AM_INIT_AUTOMAKE(FlightGear, 0.9.9)
|
AM_INIT_AUTOMAKE(FlightGear, 0.9.10-pre1)
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
AC_PROG_MAKE_SET
|
AC_PROG_MAKE_SET
|
||||||
|
@ -376,7 +376,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING([for simgear 0.3.9 or newer])
|
AC_MSG_CHECKING([for simgear 0.3.10 or newer])
|
||||||
AC_TRY_RUN([
|
AC_TRY_RUN([
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
@ -387,7 +387,7 @@ AC_TRY_RUN([
|
||||||
|
|
||||||
#define MIN_MAJOR 0
|
#define MIN_MAJOR 0
|
||||||
#define MIN_MINOR 3
|
#define MIN_MINOR 3
|
||||||
#define MIN_MICRO 9
|
#define MIN_MICRO 10
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
int major, minor, micro;
|
int major, minor, micro;
|
||||||
|
|
|
@ -278,6 +278,8 @@ static FGReplayData interpolate( double time, FGReplayData f1, FGReplayData f2 )
|
||||||
result.fdm.rpm[i] = weight( fdm1.rpm[i], fdm2.rpm[i], ratio );
|
result.fdm.rpm[i] = weight( fdm1.rpm[i], fdm2.rpm[i], ratio );
|
||||||
result.fdm.fuel_flow[i]
|
result.fdm.fuel_flow[i]
|
||||||
= weight( fdm1.fuel_flow[i], fdm2.fuel_flow[i], ratio );
|
= weight( fdm1.fuel_flow[i], fdm2.fuel_flow[i], ratio );
|
||||||
|
result.fdm.fuel_px[i]
|
||||||
|
= weight( fdm1.fuel_px[i], fdm2.fuel_px[i], ratio );
|
||||||
result.fdm.egt[i] = weight( fdm1.egt[i], fdm2.egt[i], ratio );
|
result.fdm.egt[i] = weight( fdm1.egt[i], fdm2.egt[i], ratio );
|
||||||
result.fdm.cht[i] = weight( fdm1.cht[i], fdm2.cht[i], ratio );
|
result.fdm.cht[i] = weight( fdm1.cht[i], fdm2.cht[i], ratio );
|
||||||
result.fdm.mp_osi[i] = weight( fdm1.mp_osi[i], fdm2.mp_osi[i], ratio );
|
result.fdm.mp_osi[i] = weight( fdm1.mp_osi[i], fdm2.mp_osi[i], ratio );
|
||||||
|
|
|
@ -974,7 +974,7 @@ bool fgMainInit( int argc, char **argv ) {
|
||||||
fgInitFGRoot(argc, argv);
|
fgInitFGRoot(argc, argv);
|
||||||
|
|
||||||
// Check for the correct base package version
|
// Check for the correct base package version
|
||||||
static char required_version[] = "0.9.9";
|
static char required_version[] = "0.9.10";
|
||||||
string base_version = fgBasePackageVersion();
|
string base_version = fgBasePackageVersion();
|
||||||
if ( !(base_version == required_version) ) {
|
if ( !(base_version == required_version) ) {
|
||||||
// tell the operator how to use this application
|
// tell the operator how to use this application
|
||||||
|
|
Loading…
Add table
Reference in a new issue