From 475fbce296901460f2745ebc0d8666c64e9f1f66 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Sat, 21 Jun 1997 17:52:22 +0000
Subject: [PATCH] Continue directory shuffling ... everything should be
 compilable/runnable again.

---
 FDM/flight.h       | 22 ++++++++++++++--------
 Main/Makefile      |  7 ++++++-
 Simulator/Makefile |  6 +++++-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/FDM/flight.h b/FDM/flight.h
index f8dc1df3b..dcad05c23 100644
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -33,12 +33,14 @@
 
 
 /* Define the various supported flight models (not all implemented) */
-#define FG_SLEW      0
-#define FG_LARCSIM   1
-#define FG_ACM       2
-#define FG_HELO      3
-#define FG_BALLOON   4
-#define FG_PARACHUTE 5
+#define FG_LARCSIM     0
+#define FG_ACM         1
+#define FG_HELICOPTER  2
+#define FG_AUTOGYRO    3
+#define FG_BALLOON     4
+#define FG_PARACHUTE   5
+#define FG_SLEW        6
+#define FG_EXTERN_GPS  7
 
 
 /* Define a structure containing the shared flight model parameters */
@@ -407,9 +409,13 @@ int fgFlightModelUpdate(int model, struct flight_params *f, int multiloop);
 
 
 /* $Log$
-/* Revision 1.5  1997/06/21 17:12:49  curt
-/* Capitalized subdirectory names.
+/* Revision 1.6  1997/06/21 17:52:22  curt
+/* Continue directory shuffling ... everything should be compilable/runnable
+/* again.
 /*
+ * Revision 1.5  1997/06/21 17:12:49  curt
+ * Capitalized subdirectory names.
+ *
  * Revision 1.4  1997/05/29 22:39:57  curt
  * Working on incorporating the LaRCsim flight model.
  *
diff --git a/Main/Makefile b/Main/Makefile
index f639acb3b..3b8e0a0bc 100644
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -68,7 +68,8 @@ CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c
 OFILES = $(CFILES:.c=.o)
 AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
 	../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
-	../Flight/Slew/libSlew.a ../mat3/libmat3.a ../Scenery/libScenery.a \
+	../Flight/Slew/libSlew.a ../mat3/libmat3.a \
+	../Scenery/ParseScn/libParseScn.a ../Scenery/libScenery.a \
 	../Timer/libTimer.a
 
 
@@ -105,6 +106,10 @@ mesh2GL.o: mesh2GL.c ../Scenery/mesh.h
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.14  1997/06/21 17:52:23  curt
+# Continue directory shuffling ... everything should be compilable/runnable
+# again.
+#
 # Revision 1.13  1997/06/21 17:12:54  curt
 # Capitalized subdirectory names.
 #
diff --git a/Simulator/Makefile b/Simulator/Makefile
index 92e1b2fe9..d6f1cd6fe 100644
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -27,7 +27,7 @@
 CC = gcc
 
 
-SUBSUBDIRS = Flight/LaRCsim Flight/Slew
+SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn
 SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
 MAIN = OpenGL
 
@@ -59,6 +59,10 @@ tar: clean
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.8  1997/06/21 17:52:22  curt
+# Continue directory shuffling ... everything should be compilable/runnable
+# again.
+#
 # Revision 1.7  1997/06/21 17:12:38  curt
 # Capitalized subdirectory names.
 #