Misc. tweaks.

diff --git a/Main/Makefile b/Main/Makefile
index 7f20144848ccb0cc8c464575e2b5c1dbfbf82807..ca3eb0b81af23fc3f05c24b3fb36139b49536a38 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -44,7 +44,7 @@ include $(FG_ROOT_SRC)/commondefs
 # Rule for TARGET
 #---------------------------------------------------------------------------
 
-$(TARGET): $(OBJECTS)
+$(TARGET): $(OBJECTS) $(FG_ROOT_LIB)/stamp_libs
        $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(LDLIBS)
        $(LN) -sf $(TARGET) fg$(FG_VERSION_MAJOR)
 
@@ -52,6 +52,9 @@ include $(COMMONRULES)
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.42  1998/01/21 21:11:34  curt
+# Misc. tweaks.
+#
 # Revision 1.41  1998/01/19 19:27:08  curt
 # Merged in make system changes from Bob Kuehne <rpk@sgi.com>
 # This should simplify things tremendously.

diff --git a/Main/fg_init.c b/Main/fg_init.c
index 787ea8ff2e87c14f18af1fcbac61e15a22c2d76c..1d6ddd3b1331dcaae738a1b4404937fe48682853 100644 (file)
--- a/Main/fg_init.c
+++ b/Main/fg_init.c
@@ -116,16 +116,28 @@ void fgInitSubsystems( void ) {
     FG_Altitude = FG_Runway_altitude + 3.758099;
     
     /* Initial Position at (SEZ) SEDONA airport */
-    FG_Longitude = -111.7884614 * DEG_TO_RAD;
-    FG_Latitude  = 34.8486289 * DEG_TO_RAD;
-    FG_Runway_altitude = 4827;
+    /* FG_Longitude = -111.774176 * DEG_TO_RAD; */
+    /* FG_Latitude  = 34.834343 * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 4827; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+    
+    /* Initial Position SE of (SEZ) SEDONA airport */
+    /* FG_Longitude = -111.724176 * DEG_TO_RAD; */
+    /* FG_Latitude  = 34.744343 * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 7427; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
+    
+    /* Initial Position at (HSP) Hot Springs, VA */
+    FG_Longitude = (-79.8338964 /*+ 0.02*/) * DEG_TO_RAD;
+    FG_Latitude  = ( 37.9514564 /*+ 0.05*/) * DEG_TO_RAD;
+    FG_Runway_altitude = (792 /*+ 1500*/);
     FG_Altitude = FG_Runway_altitude + 3.758099;
     
     /* Initial Position at (ANE) Anoka County airport */
-    FG_Longitude = -93.2113889 * DEG_TO_RAD;
-    FG_Latitude  = 45.145 * DEG_TO_RAD;
-    FG_Runway_altitude = 912;
-    FG_Altitude = FG_Runway_altitude + 3.758099;
+    /* FG_Longitude = -93.2113889 * DEG_TO_RAD; */
+    /* FG_Latitude  = 45.145 * DEG_TO_RAD; */
+    /* FG_Runway_altitude = 912; */
+    /* FG_Altitude = FG_Runway_altitude + 3.758099; */
     
     /* Initial Position north of the city of Globe */
     /* FG_Longitude = ( -398673.28 / 3600.0 ) * DEG_TO_RAD; */
@@ -150,7 +162,7 @@ void fgInitSubsystems( void ) {
     /* FG_Latitude  = ( 93312.00 / 3600.0 ) * DEG_TO_RAD; */
 
  
-   printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
+    printf("Initial position is: (%.4f, %.4f, %.2f)\n", 
           FG_Longitude * RAD_TO_DEG, FG_Latitude * RAD_TO_DEG, 
           FG_Altitude * FEET_TO_METER);
 
@@ -287,10 +299,13 @@ void fgInitSubsystems( void ) {
 
 
 /* $Log$
-/* Revision 1.32  1998/01/19 19:27:08  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.33  1998/01/21 21:11:34  curt
+/* Misc. tweaks.
 /*
+ * Revision 1.32  1998/01/19 19:27:08  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.31  1998/01/19 18:40:32  curt
  * Tons of little changes to clean up the code and to remove fatal errors
  * when building with the c++ compiler.

diff --git a/Simulator/Thanks b/Simulator/Thanks
index f7bb3fae834adfa12dae78ada9981370553145f0..44c7aef131b11f07aa5cff2d49a5294e4151644f 100644 (file)
--- a/Simulator/Thanks
+++ b/Simulator/Thanks
@@ -37,6 +37,10 @@ Reto Koradi <kor@mol.biol.ethz.ch> http://www.mol.biol.ethz.ch/~kor
   Helped me get on track with setting up fog effects.
 
 
+Bob Kuehne <rpk@sgi.com>
+  Redid the Makefile system so it is simpler and more robust.
+
+
 Eric Mitchell <mitchell@mars.ark.com>
   Contributed some topnotch scenery textures.
 

diff --git a/Simulator/commondefs b/Simulator/commondefs
index 7dd6e4427fd7ecb1b7529168ee140c25640b6587..5e99dec8682f832f2865c0906e2e629d58ffcfc7 100644 (file)
--- a/Simulator/commondefs
+++ b/Simulator/commondefs
@@ -13,8 +13,8 @@ FG_VERSION = $(FG_VERSION_MAJOR).$(FG_VERSION_MINOR)
 # Choose your weapons
 #---------------------------------------------------------------------------
 
-CC = g++
-CXX = g++
+CC = gcc
+CXX = gcc
 LD = ld
 AR = ar
 RANLIB = ranlib

diff --git a/Simulator/commonrules b/Simulator/commonrules
index ce62eea1697dd3f7e28f792c3ef14e2e199709e7..faba7e5cf1dd222104fcd36805e2254e2cad3f35 100644 (file)
--- a/Simulator/commonrules
+++ b/Simulator/commonrules
@@ -9,6 +9,7 @@ $(ARLIBRARY): $(OBJECTS)
        $(RANLIB) $(ARLIBRARY)
        echo $(VPATH)
        $(MV) $(ARLIBRARY) $(FG_ROOT_LIB)
+       touch $(FG_ROOT_LIB)/stamp_libs
 
 $(LDLIBTARGET): $(OBJECTS)
        $(LD) -o $(LDLIBRARY) $(LDFLAGS) $(OBJECTS)

diff --git a/Time/Makefile b/Time/Makefile
index 1a749bd8251b1b13cec41a217a80d8cd096b19d7..6de01e60588a5b38e3ffc137c24d47175daf12e0 100644 (file)
--- a/Time/Makefile
+++ b/Time/Makefile
@@ -26,7 +26,7 @@
 ARLIBRARY = libTime.a
 TARGETS = $(ARLIBRARY)
 
-CFILES = event.c fg_time.c fg_timer.c scheduler.c sunpos.c
+CFILES = event.c fg_time.c fg_timer.c sunpos.c
 CXXFILES = 
 
 LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)

diff --git a/Time/fg_time.c b/Time/fg_time.c
index 669c68faaa7db4730aa280a8a5002e7655a1120e..c520a16b693c4a4fd5ee3cc5c73a9cdbbff32437 100644 (file)
--- a/Time/fg_time.c
+++ b/Time/fg_time.c
@@ -55,8 +55,7 @@ void fgTimeInit(struct fgTIME *t) {
     printf("Initializing Time\n");
 
     t->gst_diff = -9999.0;
-    t->warp = 0;
-    t->warp = 0 * 3600;
+    t->warp = (0) * 3600;
     t->warp_delta = 0;
 }
 
@@ -300,10 +299,13 @@ void fgTimeUpdate(struct fgFLIGHT *f, struct fgTIME *t) {
 
 
 /* $Log$
-/* Revision 1.29  1998/01/19 19:27:20  curt
-/* Merged in make system changes from Bob Kuehne <rpk@sgi.com>
-/* This should simplify things tremendously.
+/* Revision 1.30  1998/01/21 21:11:35  curt
+/* Misc. tweaks.
 /*
+ * Revision 1.29  1998/01/19 19:27:20  curt
+ * Merged in make system changes from Bob Kuehne <rpk@sgi.com>
+ * This should simplify things tremendously.
+ *
  * Revision 1.28  1998/01/19 18:35:49  curt
  * Minor tweaks and fixes for cygwin32.
  *