cygwin related fixes, and some minor future release related maintenance

work.

Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	Thanks
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/src/FlightGear-0.9/admin/am2dsp.pl)
 	(cd $(top_srcdir); tar --exclude docs-mini/CVS --exclude hints/CVS \
 		-cf - docs-mini ) | (cd $(distdir); tar xvf -)
 	rm -rf `find $(distdir)/projects -name CVS`

configure.ac

@@ -683,6 +683,8 @@ AC_CONFIG_FILES([ \
 	tests/Makefile \
 	utils/Makefile \
 	utils/GPSsmooth/Makefile \
+	utils/fgadmin/Makefile
+	utils/fgadmin/src/Makefile \
 	utils/js_server/Makefile \
 	utils/Modeller/Makefile \
 	utils/TerraSync/Makefile \

src/Airports/groundnetwork.cxx

@@ -791,7 +791,7 @@ void FGGroundNetwork::checkSpeedAdjustment(int id, double lat,
   //closest = current;
   
   previousInstruction = current->getSpeedAdjustment();
-  double mindist = HUGE;
+  double mindist = HUGE_VAL;
   if (activeTraffic.size()) 
     {
       double course, dist, bearing, minbearing;

src/Cockpit/hud.hxx

@@ -38,6 +38,10 @@
 #  include <windows.h>
 #endif
 
+#ifdef __CYGWIN__
+#include <ieeefp.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 

src/Environment/fgmetar.cxx

@@ -32,6 +32,13 @@
  * TODO
  * - NSC & mil. color codes
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
 
 #include <simgear/math/sg_random.h>
 #include <simgear/timing/sg_time.hxx>

src/Input/Makefile.am

@@ -12,7 +12,7 @@ js_demo_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul
 
 fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
-fgjs_LDADD = -lplibjs $(base_LIBS) $(joystick_LIBS) -lplibul \
+fgjs_LDADD = -lplibjs -lplibul $(base_LIBS) $(joystick_LIBS) \
 	-lsgprops -lsgmisc -lsgio -lsgdebug -lsgstructure -lsgxml -lz
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/Main

src/Main/options.cxx

@@ -1189,6 +1189,16 @@ fgOptRunway( const char *arg )
     return FG_OPTIONS_OK;
 }
 
+static int
+fgOptParking( const char *arg )
+{
+    cerr << "Processing argument " << arg << endl;
+    fgSetString("/sim/presets/parking", arg );
+    fgSetBool  ("/sim/presets/parking-requested", true );
+    return FG_OPTIONS_OK;
+}
+
+
 static map<string,size_t> fgOptionMap;
 
 /*
@@ -1395,6 +1405,7 @@ struct OptionDesc {
     {"min-status",                   true,  OPTION_STRING,  "/sim/aircraft-min-status", false, "all", 0 },
     {"livery",                       true,  OPTION_FUNC,   "", false, "", fgOptLivery },
     {"ai-scenario",                  true,  OPTION_FUNC,   "", false, "", fgOptScenario },
+    {"parking-id",                   true,  OPTION_FUNC,   "", false, "", fgOptParking  },
     {0}
 };
 

src/Network/lfsglass.cxx

@@ -27,6 +27,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>

utils/Modeller/photomodel.cxx

@@ -1,3 +1,11 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h> // exit()
 

utils/TerraSync/terrasync.cxx

@@ -20,6 +20,14 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 
 #include <stdlib.h>             // atoi() atof() abs() system()