Tweaks for building with native SGI compilers.

[flightgear.git] / Main / options.cxx

diff --git a/Main/options.cxx b/Main/options.cxx
index 3d026eb9d79fbb569f4ed0685ae87bd00aead782..b4e0e7aff713d73ddf0c240b91a9d491e1aed6cc 100644 (file)
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -1,4 +1,3 @@
-//
 // options.cxx -- class to handle command line options
 //
 // Written by Curtis Olson, started April 1998.
@@ -27,20 +26,26 @@
 #  include <config.h>
 #endif
 
+#include <Include/compiler.h>
+
 #include <math.h>            // rint()
 #include <stdio.h>
 #include <stdlib.h>          // atof(), atoi()
 #include <string.h>
-#include <string>
+
+#include STL_STRING
 
 #include <Debug/logstream.hxx>
-#include <Flight/flight.hxx>
+#include <Misc/fgstream.hxx>
+#include <FDM/flight.hxx>
 #include <Include/fg_constants.h>
 #include <Main/options.hxx>
-#include <Misc/fgstream.hxx>
 
 #include "fg_serial.hxx"
 
+FG_USING_STD(string);
+FG_USING_NAMESPACE(std);
+
 
 inline double
 atof( const string& str )
@@ -129,7 +134,7 @@ fgOPTIONS::fgOPTIONS() :
     sound(1),
 
     // Flight Model options
-    flight_model(FGState::FG_LARCSIM),
+    flight_model(FGInterface::FG_LARCSIM),
 
     // Rendering options
     fog(FG_FOG_NICEST),  // nicest
@@ -304,19 +309,21 @@ fgOPTIONS::parse_tile_radius( const string& arg ) {
 }
 
 
-// Parse --flightmode=abcdefg type option 
+// Parse --fdm=abcdefg type option 
 int
-fgOPTIONS::parse_flight_model( const string& fm ) {
-    // printf("flight model = %s\n", fm);
+fgOPTIONS::parse_fdm( const string& fm ) {
+    // printf("fdm = %s\n", fm);
 
     if ( fm == "slew" ) {
-       return FGState::FG_SLEW;
+       return FGInterface::FG_SLEW;
+    } else if ( fm == "jsb" ) {
+       return FGInterface::FG_JSBSIM;
     } else if ( (fm == "larcsim") || (fm == "LaRCsim") ) {
-       return FGState::FG_LARCSIM;
+       return FGInterface::FG_LARCSIM;
     } else if ( fm == "external" ) {
-       return FGState::FG_EXTERNAL;
+       return FGInterface::FG_EXTERNAL;
     } else {
-       FG_LOG( FG_GENERAL, FG_ALERT, "Unknown flight model = " << fm );
+       FG_LOG( FG_GENERAL, FG_ALERT, "Unknown fdm = " << fm );
        exit(-1);
     }
 
@@ -427,8 +434,8 @@ int fgOPTIONS::parse_option( const string& arg ) {
        pitch = atof( arg.substr(8) );
     } else if ( arg.find( "--fg-root=" ) != string::npos ) {
        fg_root = arg.substr( 10 );
-    } else if ( arg.find( "--flight-model=" ) != string::npos ) {
-       flight_model = parse_flight_model( arg.substr(15) );
+    } else if ( arg.find( "--fdm=" ) != string::npos ) {
+       flight_model = parse_fdm( arg.substr(6) );
     } else if ( arg == "--fog-disable" ) {
        fog = FG_FOG_DISABLED;  
     } else if ( arg == "--fog-fastest" ) {
@@ -576,7 +583,7 @@ void fgOPTIONS::usage ( void ) {
     printf("\n");
  
     printf("Flight Model:\n");
-    printf("\t--flight-mode=abcd:  one of slew, larcsim, or external\n");
+    printf("\t--fdm=abcd:  one of slew, jsb, larcsim, or external\n");
     printf("\n");
 
     printf("Initial Position and Orientation:\n");
@@ -630,6 +637,22 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.41  1999/03/02 01:03:17  curt
+// Tweaks for building with native SGI compilers.
+//
+// Revision 1.40  1999/02/26 22:09:51  curt
+// Added initial support for native SGI compilers.
+//
+// Revision 1.39  1999/02/05 21:29:12  curt
+// Modifications to incorporate Jon S. Berndts flight model code.
+//
+// Revision 1.38  1999/02/01 21:33:35  curt
+// Renamed FlightGear/Simulator/Flight to FlightGear/Simulator/FDM since
+// Jon accepted my offer to do this and thought it was a good idea.
+//
+// Revision 1.37  1999/01/19 20:57:05  curt
+// MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
+//
 // Revision 1.36  1999/01/07 20:25:10  curt
 // Updated struct fgGENERAL to class FGGeneral.
 //