builddir -> srcdir so builds can be done outside the master source directory.

[flightgear.git] / src / FDM / JSBSim / FGControls.h

diff --git a/src/FDM/JSBSim/FGControls.h b/src/FDM/JSBSim/FGControls.h
index 30f2e78798890a85fc8997373a2b9c158edd0e7e..fcfaa4a007f71bed7b81036e9a1c468452283523 100644 (file)
--- a/src/FDM/JSBSim/FGControls.h
+++ b/src/FDM/JSBSim/FGControls.h
@@ -30,19 +30,19 @@
 # error This library requires C++
 #endif                                   
 
-//using namespace std;
-
 // Define a structure containing the control parameters
 
 class FGControls {
 
 public:
 
-    static const int ALL_ENGINES = -1;
-    static const int MAX_ENGINES = 10;
+    enum {
+      ALL_ENGINES = -1,
+      MAX_ENGINES = 10,
 
-    static const int ALL_WHEELS = -1;
-    static const int MAX_WHEELS = 3;
+      ALL_WHEELS = -1,
+      MAX_WHEELS = 3
+    };
 
 private:
 
@@ -177,6 +177,19 @@ extern FGControls controls;
 
 
 // $Log$
+// Revision 1.13  2000/07/24 15:26:06  curt
+// Sync the JSBSim code with the Jon & Tony's devel version.
+// Renamed JSBsim -> the official JSBSim.
+//
+// Revision 1.6  2000/06/03 13:59:52  jsb
+// Changes for compatibility with MSVC
+//
+// Revision 1.5  2000/05/12 22:45:35  jsb
+// Removed extraneous namespace identifiers and header files
+//
+// Revision 1.4  2000/04/26 10:55:57  jsb
+// Made changes as required by Curt to install JSBSim into FGFS
+//
 // Revision 1.7  2000/04/24 21:49:07  curt
 // Updated JSBsim code.
 //