1
0
Fork 0

Tidy up for a source code "snapshot" release.

This commit is contained in:
curt 2008-10-30 18:35:44 +00:00
parent 9b8aa717f5
commit e8ff28f9f8
8 changed files with 49 additions and 29 deletions

View file

@ -2672,21 +2672,6 @@ SOURCE=.\src\FDM\JSBSim\models\propulsion\FGRocket.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\src\FDM\JSBSim\models\propulsion\FGRotor.cpp
!IF "$(CFG)" == "FlightGear - Win32 Release"
# PROP Intermediate_Dir "Release\Lib_Propulsion"
!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug"
# PROP Intermediate_Dir "Debug\Lib_Propulsion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\src\FDM\JSBSim\models\propulsion\FGTank.cpp SOURCE=.\src\FDM\JSBSim\models\propulsion\FGTank.cpp
!IF "$(CFG)" == "FlightGear - Win32 Release" !IF "$(CFG)" == "FlightGear - Win32 Release"
@ -10548,6 +10533,36 @@ SOURCE=.\src\Navaids\navlist.cxx
!ENDIF !ENDIF
# End Source File
# Begin Source File
SOURCE=.\src\Navaids\positioned.hxx
!IF "$(CFG)" == "FlightGear - Win32 Release"
# PROP Intermediate_Dir "Release\Lib_Navaids"
!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug"
# PROP Intermediate_Dir "Debug\Lib_Navaids"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\src\Navaids\positioned.cxx
!IF "$(CFG)" == "FlightGear - Win32 Release"
# PROP Intermediate_Dir "Release\Lib_Navaids"
!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug"
# PROP Intermediate_Dir "Debug\Lib_Navaids"
!ENDIF
# End Source File # End Source File
# End Group # End Group
# Begin Group "Lib_Network" # Begin Group "Lib_Network"

4
NEWS
View file

@ -1,3 +1,7 @@
Version 1.99.5
* October 30, 2008 (source code snapshot release)
New in 0.9.10 New in 0.9.10
* April 5, 2006 * April 5, 2006

View file

@ -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, 1.99.4) AM_INIT_AUTOMAKE(FlightGear, 1.99.5)
dnl Checks for programs. dnl Checks for programs.
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -22,7 +22,7 @@ AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
# specify the simgear location # specify the simgear location
AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to simgear]) AC_ARG_WITH(simgear, [ --with-simgear=PREFIX Specify the prefix path to SimGear])
if test "x$with_simgear" != "x" ; then if test "x$with_simgear" != "x" ; then
echo "SimGear prefix path is $with_simgear" echo "SimGear prefix path is $with_simgear"
@ -390,7 +390,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
exit exit
fi fi
AC_MSG_CHECKING([for simgear 0.3.10 or newer]) AC_MSG_CHECKING([for SimGear 1.99.5 or newer])
AC_TRY_RUN([ AC_TRY_RUN([
#include <stdio.h> #include <stdio.h>
@ -399,9 +399,9 @@ AC_TRY_RUN([
#define STRINGIFY(X) XSTRINGIFY(X) #define STRINGIFY(X) XSTRINGIFY(X)
#define XSTRINGIFY(X) #X #define XSTRINGIFY(X) #X
#define MIN_MAJOR 0 #define MIN_MAJOR 1
#define MIN_MINOR 3 #define MIN_MINOR 99
#define MIN_MICRO 10 #define MIN_MICRO 5
int main() { int main() {
int major, minor, micro; int major, minor, micro;
@ -423,7 +423,7 @@ int main() {
], ],
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
[AC_MSG_RESULT(wrong version); [AC_MSG_RESULT(wrong version);
AC_MSG_ERROR([Install latest simgear first...])], AC_MSG_ERROR([Install latest SimGear first...])],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
) )

View file

@ -525,6 +525,7 @@ void FGExternalPipe::update_property( double dt ) {
cout << "Error reading data" << endl; cout << "Error reading data" << endl;
} else { } else {
// cout << " read " << strlen(cmd) << " bytes" << endl; // cout << " read " << strlen(cmd) << " bytes" << endl;
// cout << cmd << endl;
} }
// chop trailing newline // chop trailing newline

View file

@ -46,7 +46,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.99.4" #define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.99.5"
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -64,7 +64,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
#define VERSION "1.99.4" #define VERSION "1.99.5"
/* Define if compiling on a Winbloze (95, NT, etc.) platform */ /* Define if compiling on a Winbloze (95, NT, etc.) platform */
#define WIN32 1 #define WIN32 1

View file

@ -19,7 +19,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.99.4" #define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.99.5"
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -37,7 +37,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
#define VERSION "1.99.4" #define VERSION "1.99.5"
#ifndef FG_VERSION /* allow override */ #ifndef FG_VERSION /* allow override */
#define FG_VERSION 7 #define FG_VERSION 7
#endif /* FG_VERSION */ #endif /* FG_VERSION */

View file

@ -50,7 +50,7 @@
#define PACKAGE "FlightGear" #define PACKAGE "FlightGear"
/* Define to package version - use in main.cxx */ /* Define to package version - use in main.cxx */
#define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.99.4" #define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.99.5"
/* Define as the return type of signal handlers (int or void). */ /* Define as the return type of signal handlers (int or void). */
#define RETSIGTYPE void #define RETSIGTYPE void
@ -68,7 +68,7 @@
#define TM_IN_SYS_TIME 1 #define TM_IN_SYS_TIME 1
/* Define to version number */ /* Define to version number */
#define VERSION "1.99.4" #define VERSION "1.99.5"
/* Define if compiling on a Winbloze (95, NT, etc.) platform */ /* Define if compiling on a Winbloze (95, NT, etc.) platform */
#define WIN32 1 #define WIN32 1

View file

@ -997,7 +997,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[] = "1.0.0"; static char required_version[] = "1.99.5";
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