David Luff:

Attached are patches to Terragear to enable it to compile out of the box on
Cygwin (once all the relavent libraries have been compiled).  Specifically
they fix a conflict with another version of min/max somewhere on the
system.

configure.ac

@@ -159,6 +159,7 @@ else
 
     echo Win32 specific hacks...
     AC_DEFINE([WIN32], 1, [Define if building on a Win32 platform])
+    AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
     dnl just define these to true and hope for the best
     ac_cv_lib_glut_glutGetModifiers="yes"

src/Airports/GenAirports/convex_hull.cxx

@@ -21,6 +21,9 @@
 // $Id$
 //
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <math.h>
 #include <stdio.h>

src/BuildTiles/Main/construct.cxx

@@ -21,6 +21,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include "construct.hxx"
 

src/BuildTiles/Main/master.cxx

@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <stdlib.h>    // for system()
 #include <sys/stat.h>  // for stat()

src/BuildTiles/Parallel/fgfs-launch-clients

@@ -100,7 +100,8 @@ for i in $CLIENTS_RUDE; do
     # KILL_COMMAND="killall $CLIENT"
     # ssh -n $i "$KILL_COMMAND"
 
-    RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude --cover=$WORK_BASE/LC-Global/gusgs2_0ll.img AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass USA-Hydro USA-Urban SRTM-1 SRTM-3 DEM-3 DEM-30"
+    # RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude --cover=$WORK_BASE/LC-Global/gusgs2_0ll.img AirportArea AirportObj GSHHS-Ponds GSHHS-Islands GSHHS-Lakes GSHHS-LandMass USA-Hydro USA-Urban SRTM-1 SRTM-3 DEM-3 DEM-30"
+    RMT_COMMAND="source ~/.profile; nice $CLIENT --host=$SERVER_HOST --port=$SERVER_PORT --work-dir=$WORK_BASE --output-dir=$OUTPUT_DIR --rude AirportArea AirportObj GSHHS-LandMass VPF-Canals VPF-Cities VPF-FloodLand VPF-Lakes VPF-LandCover VPF-Railroads VPF-Rivers VPF-Roads VPF-Towns SRTM-1 SRTM-3 DEM-3 DEM-30"
     echo "client command:"
     echo ""
     echo "$RMT_COMMAND"

src/Lib/Array/array.hxx

@@ -76,9 +76,6 @@ private:
     point_list corner_list;
     point_list fitted_list;
 
-    // bool
-    // CLO 8/18/2003 // bool fit_on_the_fly;
-
 public:
 
     // Constructor
@@ -101,14 +98,6 @@ public:
     // neighbor.
     void remove_voids();
 
-    // Use least squares to fit a simpler data set to dem data.
-    // Return the number of fitted nodes.  This is a horrible approach
-    // that doesn't really work, but it's better than nothing if
-    // you've got nothing.  Using src/Prep/ArrayFit to create .fit
-    // files from the .arr files is a *much* better approach, but it
-    // is slower which is why it needs to be done "offline".
-    // CLO 8/18/2003 // int fit( double error );
-
     // add a node to the output corner node list
     void add_corner_node( int i, int j, double val );
 

src/Lib/Polygon/split-bin.cxx

@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>
 

src/Prep/DemChop/demchop.cxx

@@ -21,6 +21,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>
 

src/Prep/DemChop/hgtchop.cxx

@@ -21,6 +21,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>
 

src/Prep/DemChop/testassem.cxx

@@ -21,6 +21,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>
 

src/Prep/GSHHS/gshhs_split.cxx

@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>
 

src/Prep/Photo/photo.cxx

@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <simgear/compiler.h>