From e93197d1b59c1b8f5ce315fe3aa32a76087c2ba7 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 25 Aug 2003 19:12:20 +0000 Subject: [PATCH] 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 | 1 + src/Airports/GenAirports/convex_hull.cxx | 3 +++ src/BuildTiles/Main/construct.cxx | 3 +++ src/BuildTiles/Main/master.cxx | 3 +++ src/BuildTiles/Parallel/fgfs-launch-clients | 3 ++- src/Lib/Array/array.hxx | 11 ----------- src/Lib/Polygon/split-bin.cxx | 3 +++ src/Prep/DemChop/demchop.cxx | 3 +++ src/Prep/DemChop/hgtchop.cxx | 3 +++ src/Prep/DemChop/testassem.cxx | 3 +++ src/Prep/GSHHS/gshhs_split.cxx | 3 +++ src/Prep/Photo/photo.cxx | 3 +++ 12 files changed, 30 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 51dd1116..2217c066 100644 --- a/configure.ac +++ b/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" diff --git a/src/Airports/GenAirports/convex_hull.cxx b/src/Airports/GenAirports/convex_hull.cxx index ab08136a..1027040f 100644 --- a/src/Airports/GenAirports/convex_hull.cxx +++ b/src/Airports/GenAirports/convex_hull.cxx @@ -21,6 +21,9 @@ // $Id$ // +#ifdef HAVE_CONFIG_H +# include +#endif #include #include diff --git a/src/BuildTiles/Main/construct.cxx b/src/BuildTiles/Main/construct.cxx index b43843e9..a4128304 100644 --- a/src/BuildTiles/Main/construct.cxx +++ b/src/BuildTiles/Main/construct.cxx @@ -21,6 +21,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include "construct.hxx" diff --git a/src/BuildTiles/Main/master.cxx b/src/BuildTiles/Main/master.cxx index 105ddc3b..e78d9423 100644 --- a/src/BuildTiles/Main/master.cxx +++ b/src/BuildTiles/Main/master.cxx @@ -20,6 +20,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include // for system() #include // for stat() diff --git a/src/BuildTiles/Parallel/fgfs-launch-clients b/src/BuildTiles/Parallel/fgfs-launch-clients index 1729babe..8543f57a 100755 --- a/src/BuildTiles/Parallel/fgfs-launch-clients +++ b/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" diff --git a/src/Lib/Array/array.hxx b/src/Lib/Array/array.hxx index 43c99292..d19465f3 100644 --- a/src/Lib/Array/array.hxx +++ b/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 ); diff --git a/src/Lib/Polygon/split-bin.cxx b/src/Lib/Polygon/split-bin.cxx index 6a5aa947..5525bbc8 100644 --- a/src/Lib/Polygon/split-bin.cxx +++ b/src/Lib/Polygon/split-bin.cxx @@ -20,6 +20,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include diff --git a/src/Prep/DemChop/demchop.cxx b/src/Prep/DemChop/demchop.cxx index 8772c61c..4f85ddc0 100644 --- a/src/Prep/DemChop/demchop.cxx +++ b/src/Prep/DemChop/demchop.cxx @@ -21,6 +21,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include diff --git a/src/Prep/DemChop/hgtchop.cxx b/src/Prep/DemChop/hgtchop.cxx index 06732bd6..7b369e04 100644 --- a/src/Prep/DemChop/hgtchop.cxx +++ b/src/Prep/DemChop/hgtchop.cxx @@ -21,6 +21,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include diff --git a/src/Prep/DemChop/testassem.cxx b/src/Prep/DemChop/testassem.cxx index 9382fb2d..51b8c860 100644 --- a/src/Prep/DemChop/testassem.cxx +++ b/src/Prep/DemChop/testassem.cxx @@ -21,6 +21,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include diff --git a/src/Prep/GSHHS/gshhs_split.cxx b/src/Prep/GSHHS/gshhs_split.cxx index d0c57493..a35fc18c 100644 --- a/src/Prep/GSHHS/gshhs_split.cxx +++ b/src/Prep/GSHHS/gshhs_split.cxx @@ -20,6 +20,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include diff --git a/src/Prep/Photo/photo.cxx b/src/Prep/Photo/photo.cxx index 93d43caa..6c72da1e 100644 --- a/src/Prep/Photo/photo.cxx +++ b/src/Prep/Photo/photo.cxx @@ -20,6 +20,9 @@ // // $Id$ +#ifdef HAVE_CONFIG_H +# include +#endif #include