Capitalized subdirectory names.

diff --git a/Aircraft/Makefile b/Aircraft/Makefile
index ce98c284653e812a057d5e998033bb5db121cd90..dbe37f3b1ec0f436fb0c58c51221dd9b05794ec8 100644 (file)
--- a/Aircraft/Makefile
+++ b/Aircraft/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET = libaircraft.a
+TARGET = libAircraft.a
 
 CFILES = aircraft.c
 HFILES = aircraft.h
@@ -61,12 +61,15 @@ clean:
 aircraft.o: aircraft.c aircraft.h
        $(CC) $(CFLAGS) $(INCLUDES) -c aircraft.c
 
-aircraft.h: ../flight/flight.h ../controls/controls.h
+aircraft.h: ../Flight/flight.h ../Controls/controls.h
        touch aircraft.h
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1997/06/21 17:12:42  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.2  1997/05/23 15:40:29  curt
 # Added GNU copyright headers.
 #

diff --git a/Aircraft/aircraft.h b/Aircraft/aircraft.h
index fcdeccbb409665aa9dff7321527abb37a2c3491c..8d758d18f28d869de99b7e6e96f230951391592c 100644 (file)
--- a/Aircraft/aircraft.h
+++ b/Aircraft/aircraft.h
@@ -27,8 +27,8 @@
 #ifndef AIRCRAFT_H
 #define AIRCRAFT_H
 
-#include "../flight/flight.h"
-#include "../controls/controls.h"
+#include "../Flight/flight.h"
+#include "../Controls/controls.h"
 
 
 /* Define a structure containing all the parameters for an aircraft */
@@ -51,9 +51,12 @@ void aircraft_debug(int type);
 
 
 /* $Log$
-/* Revision 1.2  1997/05/23 15:40:30  curt
-/* Added GNU copyright headers.
+/* Revision 1.3  1997/06/21 17:12:42  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.2  1997/05/23 15:40:30  curt
+ * Added GNU copyright headers.
+ *
  * Revision 1.1  1997/05/16 15:58:25  curt
  * Initial revision.
  *

diff --git a/Controls/Makefile b/Controls/Makefile
index 1c1e1e4f0ff621ae373d281fb52beb29361b6558..5d5b15f4b2ef0179ac27c344f8abf2a8f68d794f 100644 (file)
--- a/Controls/Makefile
+++ b/Controls/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET = libcontrols.a
+TARGET = libControls.a
 
 CFILES = controls.c
 HFILES = controls.h
@@ -61,12 +61,15 @@ clean:
 controls.h: ../limits.h
        touch controls.h
 
-controls.o: controls.c controls.h ../aircraft/aircraft.h
+controls.o: controls.c controls.h ../Aircraft/aircraft.h
        $(CC) $(CFLAGS) $(INCLUDES) -c controls.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.4  1997/06/21 17:12:47  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.3  1997/05/31 19:16:27  curt
 # Elevator trim added.
 #

diff --git a/Controls/controls.c b/Controls/controls.c
index 7d882c0f64facb93adf43ba5eed1944eda07ff7d..0a0f9668f67545f7538cd64ca66be7b07a602758 100644 (file)
--- a/Controls/controls.c
+++ b/Controls/controls.c
@@ -25,7 +25,7 @@
 
 
 #include "controls.h"
-#include "../aircraft/aircraft.h"
+#include "../Aircraft/aircraft.h"
 
 
 void fgControlsInit() {
@@ -167,7 +167,10 @@ void fgThrottleSet(int engine, double pos) {
 
 
 /* $Log$
-/* Revision 1.1  1997/05/31 19:24:04  curt
-/* Initial revision.
+/* Revision 1.2  1997/06/21 17:12:48  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.1  1997/05/31 19:24:04  curt
+ * Initial revision.
+ *
  */

diff --git a/FDM/Makefile b/FDM/Makefile
index 718a73b4790cd286919ba57b5779ac6a233efe9b..4e90b231f8fa54d25d1a1e654e75487f59cb62b1 100644 (file)
--- a/FDM/Makefile
+++ b/FDM/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=libflight.a
+TARGET=libFlight.a
 
 CFILES = flight.c
 OFILES = $(CFILES:.c=.o)
@@ -57,7 +57,7 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-flight.h:  slew/slew.h LaRCsim/ls_interface.h
+flight.h:  Slew/slew.h LaRCsim/ls_interface.h
        touch flight.h
 
 flight.o: flight.c flight.h
@@ -66,6 +66,9 @@ flight.o: flight.c flight.h
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.4  1997/06/21 17:12:48  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.3  1997/05/29 02:32:25  curt
 # Starting to build generic flight model interface.
 #

diff --git a/FDM/flight.h b/FDM/flight.h
index 2f978bc75a39a62a2ffde094baf664d887b0a7b9..f8dc1df3b2413bcffb9afe51af181baeed98771d 100644 (file)
--- a/FDM/flight.h
+++ b/FDM/flight.h
@@ -28,7 +28,7 @@
 #define FLIGHT_H
 
 
-#include "slew/slew.h"
+#include "Slew/slew.h"
 #include "LaRCsim/ls_interface.h"
 
 
@@ -407,9 +407,12 @@ int fgFlightModelUpdate(int model, struct flight_params *f, int multiloop);
 
 
 /* $Log$
-/* Revision 1.4  1997/05/29 22:39:57  curt
-/* Working on incorporating the LaRCsim flight model.
+/* 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.
+ *
  * Revision 1.3  1997/05/29 02:32:25  curt
  * Starting to build generic flight model interface.
  *

diff --git a/LaRCsim/Makefile b/LaRCsim/Makefile
index 418a76367fd376a1312b6b68590c27fbf412f40a..9b25a2c9c135f63d9295c8aa0cead177a9b2a148 100644 (file)
--- a/LaRCsim/Makefile
+++ b/LaRCsim/Makefile
@@ -11,7 +11,7 @@
 TARGET = libLaRCsim.a
 
 LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
-       ls_step.c ls_model.c default_model_routines.c ls_init.c ls_sync.c \
+       ls_step.c ls_model.c default_model_routines.c ls_init.c ls_sync.c
 
 NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
 
@@ -56,6 +56,9 @@ clean:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1997/06/21 17:12:50  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.2  1997/06/17 16:52:02  curt
 # Timer interval stuff now uses gettimeofday() instead of ftime()
 #

diff --git a/LaRCsim/ls_interface.c b/LaRCsim/ls_interface.c
index 31ae1479a20070ca69a3e9ffe7d7938e119f078b..a0500e245dc56d3aa98e08f21e451b0d6271a8ca 100644 (file)
--- a/LaRCsim/ls_interface.c
+++ b/LaRCsim/ls_interface.c
@@ -236,7 +236,7 @@ $Original log: LaRCsim.c,v $
 #include "ls_cockpit.h"
 #include "ls_interface.h"
 #include "../flight.h"
-#include "../../aircraft/aircraft.h"
+#include "../../Aircraft/aircraft.h"
 
 /* global variable declarations */
 
@@ -909,6 +909,9 @@ int fgLaRCsim_2_Flight (struct flight_params *f) {
 /* Flight Gear Modification Log
  *
  * $Log$
+ * Revision 1.8  1997/06/21 17:12:50  curt
+ * Capitalized subdirectory names.
+ *
  * Revision 1.7  1997/05/31 19:16:28  curt
  * Elevator trim added.
  *

diff --git a/Main/GLTKkey.c b/Main/GLTKkey.c
index c34bdc3c755bc4881cda3eec6f6fa0cca958343c..a6b6efc50885ca69f9814e802b99319be9886114 100644 (file)
--- a/Main/GLTKkey.c
+++ b/Main/GLTKkey.c
@@ -63,6 +63,7 @@ GLenum GLTKkey(int k, GLenum mask) {
        return GL_TRUE;
     case TK_s:
        c->throttle[0] += 0.05;
+       return GL_TRUE;
     case TK_ESCAPE:
        tkQuit();
     }
@@ -74,10 +75,13 @@ GLenum GLTKkey(int k, GLenum mask) {
 
 
 /* $Log$
-/* Revision 1.2  1997/05/23 15:40:24  curt
-/* Added GNU copyright headers.
-/* Fog now works!
+/* Revision 1.3  1997/06/21 17:12:52  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.2  1997/05/23 15:40:24  curt
+ * Added GNU copyright headers.
+ * Fog now works!
+ *
  * Revision 1.1  1997/05/21 15:57:49  curt
  * Renamed due to added GLUT support.
  *

diff --git a/Main/GLUTkey.c b/Main/GLUTkey.c
index a670e67ec44311fdfef836efee366d641608a7b8..4c451f1e6eb90a78ca3d2b384ccd225f00cc467c 100644 (file)
--- a/Main/GLUTkey.c
+++ b/Main/GLUTkey.c
@@ -30,7 +30,7 @@
 #include <GL/glut.h>
 
 #include "GLUTkey.h"
-#include "../aircraft/aircraft.h"
+#include "../Aircraft/aircraft.h"
 
 extern double fogDensity;
 extern double goal_view_offset;
@@ -152,9 +152,12 @@ void GLUTspecialkey(int k, int x, int y) {
 
 
 /* $Log$
-/* Revision 1.11  1997/06/18 04:10:31  curt
-/* A couple more runway tweaks ...
+/* Revision 1.12  1997/06/21 17:12:52  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.11  1997/06/18 04:10:31  curt
+ * A couple more runway tweaks ...
+ *
  * Revision 1.10  1997/06/18 02:21:23  curt
  * Hacked in a runway
  *

diff --git a/Main/GLmain.c b/Main/GLmain.c
index 291f0a0579383b1f9ab434a467d81ff915bcfacf..f0e8008e6f0f0bb450a4310e4d7278cc7155a2c3 100644 (file)
--- a/Main/GLmain.c
+++ b/Main/GLmain.c
@@ -37,10 +37,10 @@
     #include "GLTKkey.h"
 #endif
 
-#include "../aircraft/aircraft.h"
-#include "../scenery/scenery.h"
+#include "../Aircraft/aircraft.h"
+#include "../Scenery/scenery.h"
 #include "../mat3/mat3.h"
-#include "../timer/fg_timer.h"
+#include "../Timer/fg_timer.h"
 
 
 #define DEG_TO_RAD       0.017453292
@@ -336,14 +336,17 @@ GLint fgRunwayHack(double width, double length) {
 static void fgSceneryDraw() {
     static float z = 32.35;
 
+    glPushMatrix();
+
     glCallList(terrain);
 
-    /* z -= 0.01; */
     printf("*** Drawing runway at %.2f\n", z);
 
-    glTranslatef( -398391.28, 120070.41, z);
+    glTranslatef( -398391.28, 120070.41, 32.35);
     glRotatef(170.0, 0.0, 0.0, 1.0);
     glCallList(runway);
+
+    glPopMatrix();
 }
 
 
@@ -534,9 +537,12 @@ int main( int argc, char *argv[] ) {
 
 
 /* $Log$
-/* Revision 1.19  1997/06/18 04:10:31  curt
-/* A couple more runway tweaks ...
+/* Revision 1.20  1997/06/21 17:12:53  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.19  1997/06/18 04:10:31  curt
+ * A couple more runway tweaks ...
+ *
  * Revision 1.18  1997/06/18 02:21:24  curt
  * Hacked in a runway
  *

diff --git a/Main/Makefile b/Main/Makefile
index 3c343496cb2346be548399f49f6f03ec86bc76a2..f639acb3b07d6ed75c7bd569ecaef8f1a7392cf1 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=proto
+TARGET=fgfs0
 
 CC = gcc
 
@@ -66,10 +66,10 @@ LIBS =  $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl
 
 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 \
-       ../timer/libtimer.a
+AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \
+       ../Flight/libFlight.a ../Flight/LaRCsim/libLaRCsim.a \
+       ../Flight/Slew/libSlew.a ../mat3/libmat3.a ../Scenery/libScenery.a \
+       ../Timer/libTimer.a
 
 
 #---------------------------------------------------------------------------
@@ -89,22 +89,25 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-GLmain.o: GLmain.c GLUTkey.h ../aircraft/aircraft.h ../scenery/scenery.h \
-       ../timer/fg_timer.h
+GLmain.o: GLmain.c GLUTkey.h ../Aircraft/aircraft.h ../Scenery/scenery.h \
+       ../Timer/fg_timer.h
        $(CC) $(CFLAGS) $(INCLUDES) -c GLmain.c
 
-GLUTkey.o: GLUTkey.c GLUTkey.h ../aircraft/aircraft.h
+GLUTkey.o: GLUTkey.c GLUTkey.h ../Aircraft/aircraft.h
        $(CC) $(CFLAGS) $(INCLUDES) -c GLUTkey.c
 
-GLTKkey.o: GLTKkey.c GLTKkey.h ../aircraft/aircraft.h
+GLTKkey.o: GLTKkey.c GLTKkey.h ../Aircraft/aircraft.h
        $(CC) $(CFLAGS) $(INCLUDES) -c GLTKkey.c
 
-mesh2GL.o: mesh2GL.c ../scenery/mesh.h
+mesh2GL.o: mesh2GL.c ../Scenery/mesh.h
        $(CC) $(CFLAGS) $(INCLUDES) -c mesh2GL.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.13  1997/06/21 17:12:54  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.12  1997/06/16 19:32:51  curt
 # Starting to add general timer support.
 #

diff --git a/Main/mesh2GL.c b/Main/mesh2GL.c
index 33192c7670e27d38c397ded5f000ad9b52751c57..64a3a28418f194070c1a8ed0bd30dab153eadcdf 100644 (file)
--- a/Main/mesh2GL.c
+++ b/Main/mesh2GL.c
@@ -31,7 +31,7 @@
     #include "gltk.h"
 #endif
 
-#include "../scenery/mesh.h"
+#include "../Scenery/mesh.h"
 #include "../mat3/mat3.h"
 
 
@@ -108,9 +108,12 @@ GLint mesh2GL(struct mesh *m) {
 
 
 /* $Log$
-/* Revision 1.20  1997/06/18 04:10:32  curt
-/* A couple more runway tweaks ...
+/* Revision 1.21  1997/06/21 17:12:54  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.20  1997/06/18 04:10:32  curt
+ * A couple more runway tweaks ...
+ *
  * Revision 1.19  1997/06/18 02:21:24  curt
  * Hacked in a runway
  *

diff --git a/Scenery/Makefile b/Scenery/Makefile
index 4b7b67b07c25055a2272dbfc23c8f37536947ecb..5ec7f8996cc1879efe4517a5c0e2af6b16204d25 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET = libscenery.a
+TARGET = libScenery.a
 
 CFILES = scanner.c parser.c common.c mesh.c
 HFILES = 
@@ -89,6 +89,9 @@ mesh.o: mesh.c mesh.h common.h
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.6  1997/06/21 17:12:55  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.5  1997/05/31 19:16:29  curt
 # Elevator trim added.
 #

diff --git a/Simulator/Makefile b/Simulator/Makefile
index 6380c973211456e6a72b7db2c1b6f13492d5bf5a..92e1b2fe94efe0041460f5cdbc4067d2d8a485ee 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -27,8 +27,8 @@
 CC = gcc
 
 
-SUBSUBDIRS = flight/LaRCsim flight/slew
-SUBDIRS = aircraft controls flight mat3 scenery timer
+SUBSUBDIRS = Flight/LaRCsim Flight/Slew
+SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
 MAIN = OpenGL
 
 
@@ -51,8 +51,17 @@ clean:
        done
 
 
+tar: clean
+       (cd ../..; \
+       tar cvf prototype-0.04.tar FlightGear/COPYING FlightGear/Docs \
+       FlightGear/Scenery/mesa-e.scn FlightGear/Src FlightGear/Thanks)
+
+
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1997/06/21 17:12:38  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.6  1997/06/16 19:32:50  curt
 # Starting to add general timer support.
 #

diff --git a/Slew/Makefile b/Slew/Makefile
index 0ef289bf6c69e484a82205626d487a33e5c85af7..12f869ec103eaa423fd4dba2ec06b02e81e5c779 100644 (file)
--- a/Slew/Makefile
+++ b/Slew/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET=libslew.a
+TARGET=libSlew.a
 
 CFILES = slew.c
 OFILES = $(CFILES:.c=.o)
@@ -57,12 +57,15 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-slew.o: slew.c slew.h ../../aircraft/aircraft.h ../../controls/controls.h
+slew.o: slew.c slew.h ../../Aircraft/aircraft.h ../../Controls/controls.h
        $(CC) $(CFLAGS) $(INCLUDES) -c slew.c
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.2  1997/06/21 17:12:51  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.1  1997/05/29 02:29:42  curt
 # Moved to their own directory.
 #

diff --git a/Slew/slew.c b/Slew/slew.c
index 7123a1c029356f03f90504d258b0628b82b2472c..db258e8117a8611d7b01db151e2eec4455aafa72 100644 (file)
--- a/Slew/slew.c
+++ b/Slew/slew.c
@@ -28,8 +28,8 @@
 
 #include "slew.h"
 #include "../flight.h"
-#include "../../aircraft/aircraft.h"
-#include "../../controls/controls.h"
+#include "../../Aircraft/aircraft.h"
+#include "../../Controls/controls.h"
 
 
 #ifndef M_PI                                    
@@ -90,9 +90,12 @@ void fgSlewUpdate() {
 
 
 /* $Log$
-/* Revision 1.3  1997/05/29 22:40:00  curt
-/* Working on incorporating the LaRCsim flight model.
+/* Revision 1.4  1997/06/21 17:12:51  curt
+/* Capitalized subdirectory names.
 /*
+ * Revision 1.3  1997/05/29 22:40:00  curt
+ * Working on incorporating the LaRCsim flight model.
+ *
  * Revision 1.2  1997/05/29 12:30:19  curt
  * Some initial mods to work better in a timer environment.
  *

diff --git a/Time/Makefile b/Time/Makefile
index 0e23092255cd58df3200d692772d55103ef85f88..e1c7142285ff9f23b9ca3bbae7ce756101ea89e0 100644 (file)
--- a/Time/Makefile
+++ b/Time/Makefile
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 
 
-TARGET = libtimer.a
+TARGET = libTimer.a
 
 CFILES = fg_timer.c
 HFILES = fg_timer.h
@@ -64,6 +64,9 @@ fg_timer.o: fg_timer.c fg_timer.h
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.2  1997/06/21 17:12:55  curt
+# Capitalized subdirectory names.
+#
 # Revision 1.1  1997/06/16 19:24:19  curt
 # Initial revision.
 #