From 13cbdf7ecc4ab3e36b35951b71512967c3db2945 Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 16 Feb 2000 22:01:47 +0000 Subject: [PATCH] More reorg. --- README.gpc | 75 ++++++++++++++++++++++++ src/Airports/GenAirports/build.cxx | 6 +- src/Airports/GenAirports/convex_hull.hxx | 2 +- src/Airports/GenAirports/main.cxx | 6 +- src/Airports/GenAirports/point2d.hxx | 4 +- src/Airports/GenAirports/runway.cxx | 4 +- src/Airports/GenAirports/runway.hxx | 2 +- src/BuildTiles/Clipper/clipper.cxx | 4 +- src/BuildTiles/Clipper/clipper.hxx | 2 +- src/BuildTiles/Clipper/testclipper.cxx | 4 +- src/BuildTiles/GenOutput/genobj.cxx | 2 +- src/BuildTiles/GenOutput/genobj.hxx | 8 +-- src/BuildTiles/Main/construct.hxx | 2 +- src/BuildTiles/Main/main.cxx | 6 +- src/BuildTiles/Main/master.cxx | 2 +- src/BuildTiles/Match/match.cxx | 6 +- src/BuildTiles/Match/match.hxx | 4 +- src/BuildTiles/Parallel/client.cxx | 2 +- src/BuildTiles/Parallel/server.cxx | 2 +- src/BuildTiles/Triangulate/triangle.hxx | 2 +- src/Lib/Array/array.cxx | 6 +- src/Lib/Array/array.hxx | 9 ++- src/Lib/Array/testarray.cxx | 2 +- src/Lib/DEM/dem.cxx | 4 +- src/Lib/DEM/dem.hxx | 4 +- src/Lib/Geometry/poly_support.cxx | 4 +- src/Lib/Geometry/poly_support.hxx | 2 +- src/Lib/Geometry/trinodes.hxx | 4 +- src/Lib/Geometry/trisegs.cxx | 2 +- src/Lib/Optimize/genfans.hxx | 2 +- src/Lib/Polygon/polygon.cxx | 2 +- src/Lib/Polygon/polygon.hxx | 2 +- src/Lib/Polygon/split.cxx | 4 +- src/Prep/DemChop/demchop.cxx | 4 +- src/Prep/GSHHS/debug.cxx | 2 +- src/Prep/GSHHS/gshhs_split.cxx | 4 +- src/Prep/GSHHS/main.cxx | 2 +- src/Prep/MergerClipper/merger.cxx | 4 +- src/Prep/MergerClipper/merger.hxx | 2 +- src/Prep/MergerClipper/testmerger.cxx | 4 +- src/Prep/ShapeFile/main.cxx | 2 +- 41 files changed, 145 insertions(+), 71 deletions(-) create mode 100644 README.gpc diff --git a/README.gpc b/README.gpc new file mode 100644 index 00000000..f58ba807 --- /dev/null +++ b/README.gpc @@ -0,0 +1,75 @@ +You need to have the GPC library installed on your system to build +some of the scenery generation tools, otherwise you won't be able to +create scenery. + +You can get the library from: + + http://www.cs.man.ac.uk/aig/staff/alan/software/ + +Unfortunately, because of some of the wording in the GPC licensing +terms we are unable to include the GPC library with the Flight Gear +distribution. + +This library comes as a single source file and header with no build +directions. So, here are some directions contributed by Riley Rainey + with additional notes by Curt Olson: + + +1. Download the GPC library source code from URL: + + http://www.cs.man.ac.uk/aig/staff/alan/software + +2. Unpack it; the current version seems to be 2.30: + + $ zcat gpc231.tar.Z | tar xvf - + +3. ***IMPORTANT STEP*** ***DO NOT SKIP*** + + This is important step if you want to use gpc to generate quality + scenery! + + Before building the library, edit the gpc.h file and change + GPC_EPSILON to something bigger. You may experiment with this + value, but the following seems to work well for me: + + #define GPC_EPSILON (0.000001) + +4. Copy in the Makefile attached to this message: + + $ cp Makefile ./gpc231 + +5. Check install paths. Edit the Makefile and make sure the install + paths are satisfactory. Also make sure that all the make commands + have leading tabs (i.e. that the tabs aren't expanded out into 8 + spaces) otherwise the make will fail. + +6. Build and install it: + + $ cd ./gpc231 + $ make + $ su + Password: + # make install + + +-------------------------- snip ------------------------------ + +# Unix/Linux makefile for GPC 2.31 +# +# Riley Rainey (riley.rainey@websimulations.com) + +CFLAGS = -O -g + +libgpc.a: gpc.o + rm -f $@ + ar cr $@ $< + ranlib $@ + +clean: + rm -f libgpc.a *.o core *~ + +install: libgpc.a + -mkdir -p /usr/local/lib + -mkdir -p /usr/local/include + install libgpc.a /usr/local/lib/libgpc.a + install gpc.h /usr/local/include/gpc.h diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx index 0936ccdd..8254569c 100644 --- a/src/Airports/GenAirports/build.cxx +++ b/src/Airports/GenAirports/build.cxx @@ -38,10 +38,10 @@ #include // plib include -#include #include -#include -#include +#include +#include +#include #include #include diff --git a/src/Airports/GenAirports/convex_hull.hxx b/src/Airports/GenAirports/convex_hull.hxx index d42c6d11..0cf51c91 100644 --- a/src/Airports/GenAirports/convex_hull.hxx +++ b/src/Airports/GenAirports/convex_hull.hxx @@ -32,7 +32,7 @@ using namespace std; #endif -#include +#include #include diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx index 74e48bc3..e181155c 100644 --- a/src/Airports/GenAirports/main.cxx +++ b/src/Airports/GenAirports/main.cxx @@ -37,10 +37,10 @@ #include #include STL_STRING -#include -#include #include -#include +#include +#include +#include #include diff --git a/src/Airports/GenAirports/point2d.hxx b/src/Airports/GenAirports/point2d.hxx index 15677c7d..049c8807 100644 --- a/src/Airports/GenAirports/point2d.hxx +++ b/src/Airports/GenAirports/point2d.hxx @@ -26,8 +26,8 @@ #define _POINT2D_HXX -#include -#include +#include +#include // convert a point from cartesian to polar coordinates diff --git a/src/Airports/GenAirports/runway.cxx b/src/Airports/GenAirports/runway.cxx index da5bdc98..e641fc6c 100644 --- a/src/Airports/GenAirports/runway.cxx +++ b/src/Airports/GenAirports/runway.cxx @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "runway.hxx" #include "point2d.hxx" diff --git a/src/Airports/GenAirports/runway.hxx b/src/Airports/GenAirports/runway.hxx index 6b743a9a..2fe87fbb 100644 --- a/src/Airports/GenAirports/runway.hxx +++ b/src/Airports/GenAirports/runway.hxx @@ -29,7 +29,7 @@ #include #include -#include +#include #include diff --git a/src/BuildTiles/Clipper/clipper.cxx b/src/BuildTiles/Clipper/clipper.cxx index 203327ca..cbd1ea03 100644 --- a/src/BuildTiles/Clipper/clipper.cxx +++ b/src/BuildTiles/Clipper/clipper.cxx @@ -24,9 +24,9 @@ -#include #include -#include +#include +#include #include diff --git a/src/BuildTiles/Clipper/clipper.hxx b/src/BuildTiles/Clipper/clipper.hxx index 82f30add..9c159c9c 100644 --- a/src/BuildTiles/Clipper/clipper.hxx +++ b/src/BuildTiles/Clipper/clipper.hxx @@ -34,7 +34,7 @@ #include -#include +#include #include diff --git a/src/BuildTiles/Clipper/testclipper.cxx b/src/BuildTiles/Clipper/testclipper.cxx index 73ed9073..70212ec6 100644 --- a/src/BuildTiles/Clipper/testclipper.cxx +++ b/src/BuildTiles/Clipper/testclipper.cxx @@ -22,8 +22,8 @@ -#include -#include +#include +#include #include "clipper.hxx" diff --git a/src/BuildTiles/GenOutput/genobj.cxx b/src/BuildTiles/GenOutput/genobj.cxx index 54c43d5f..9ca04ac2 100644 --- a/src/BuildTiles/GenOutput/genobj.cxx +++ b/src/BuildTiles/GenOutput/genobj.cxx @@ -24,7 +24,7 @@ #include -#include +#include #include #include "scenery_version.hxx" diff --git a/src/BuildTiles/GenOutput/genobj.hxx b/src/BuildTiles/GenOutput/genobj.hxx index 9a3ef282..ecd91eb8 100644 --- a/src/BuildTiles/GenOutput/genobj.hxx +++ b/src/BuildTiles/GenOutput/genobj.hxx @@ -35,10 +35,10 @@ #include STL_STRING -#include -#include -#include -#include +#include +#include +#include +#include #include #include
diff --git a/src/BuildTiles/Main/construct.hxx b/src/BuildTiles/Main/construct.hxx index d3b6584f..e3cdab98 100644 --- a/src/BuildTiles/Main/construct.hxx +++ b/src/BuildTiles/Main/construct.hxx @@ -39,7 +39,7 @@ #include STL_STRING -#include +#include #include #include diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index 4ea46362..e174b507 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -28,10 +28,10 @@ #include // set mem allocation limit #include // set mem allocation limit -#include #include -#include -#include +#include +#include +#include #include #include diff --git a/src/BuildTiles/Main/master.cxx b/src/BuildTiles/Main/master.cxx index a7da0047..2ed7f533 100644 --- a/src/BuildTiles/Main/master.cxx +++ b/src/BuildTiles/Main/master.cxx @@ -27,7 +27,7 @@ #include -#include +#include // #include // #include diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx index c010d6f9..01aeaae2 100644 --- a/src/BuildTiles/Match/match.cxx +++ b/src/BuildTiles/Match/match.cxx @@ -25,9 +25,9 @@ # include #endif -#include -#include -#include +#include +#include +#include #include "match.hxx" diff --git a/src/BuildTiles/Match/match.hxx b/src/BuildTiles/Match/match.hxx index 96b1e01e..4a34f2c9 100644 --- a/src/BuildTiles/Match/match.hxx +++ b/src/BuildTiles/Match/match.hxx @@ -31,8 +31,8 @@ #include -#include -#include +#include +#include #include
diff --git a/src/BuildTiles/Parallel/client.cxx b/src/BuildTiles/Parallel/client.cxx index 52c543e7..700a332e 100644 --- a/src/BuildTiles/Parallel/client.cxx +++ b/src/BuildTiles/Parallel/client.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #define MAXBUF 1024 diff --git a/src/BuildTiles/Parallel/server.cxx b/src/BuildTiles/Parallel/server.cxx index 872a772e..cad079e5 100644 --- a/src/BuildTiles/Parallel/server.cxx +++ b/src/BuildTiles/Parallel/server.cxx @@ -18,7 +18,7 @@ #include #include -#include +#include #if defined (sun) diff --git a/src/BuildTiles/Triangulate/triangle.hxx b/src/BuildTiles/Triangulate/triangle.hxx index c998f505..0121f65a 100644 --- a/src/BuildTiles/Triangulate/triangle.hxx +++ b/src/BuildTiles/Triangulate/triangle.hxx @@ -31,7 +31,7 @@ #include -#include +#include #include #include diff --git a/src/Lib/Array/array.cxx b/src/Lib/Array/array.cxx index de6fb886..de8a96c8 100644 --- a/src/Lib/Array/array.cxx +++ b/src/Lib/Array/array.cxx @@ -47,9 +47,9 @@ #include STL_STRING #include -#include -#include -#include +#include +#include +#include #include "array.hxx" diff --git a/src/Lib/Array/array.hxx b/src/Lib/Array/array.hxx index 38d5e3b1..b9b57f16 100644 --- a/src/Lib/Array/array.hxx +++ b/src/Lib/Array/array.hxx @@ -34,11 +34,10 @@ #include -#include - -#include -#include -#include +#include +#include +#include +#include FG_USING_STD(vector); diff --git a/src/Lib/Array/testarray.cxx b/src/Lib/Array/testarray.cxx index b3781881..665c8fcd 100644 --- a/src/Lib/Array/testarray.cxx +++ b/src/Lib/Array/testarray.cxx @@ -1,4 +1,4 @@ -#include +#include #include "array.hxx" diff --git a/src/Lib/DEM/dem.cxx b/src/Lib/DEM/dem.cxx index 22d74f5a..5359173d 100644 --- a/src/Lib/DEM/dem.cxx +++ b/src/Lib/DEM/dem.cxx @@ -47,9 +47,9 @@ # include // stat() #endif -#include -#include #include +#include +#include #include "dem.hxx" diff --git a/src/Lib/DEM/dem.hxx b/src/Lib/DEM/dem.hxx index eb23738c..1d19faf3 100644 --- a/src/Lib/DEM/dem.hxx +++ b/src/Lib/DEM/dem.hxx @@ -30,8 +30,8 @@ #endif -#include -#include +#include +#include #define DEM_SIZE 1200 diff --git a/src/Lib/Geometry/poly_support.cxx b/src/Lib/Geometry/poly_support.cxx index 1ac847d5..e56eb564 100644 --- a/src/Lib/Geometry/poly_support.cxx +++ b/src/Lib/Geometry/poly_support.cxx @@ -23,7 +23,7 @@ #include -#include +#include #include @@ -38,7 +38,7 @@ void calc_point_inside( const int contour, const FGTriNodes& trinodes ); #include -#include +#include #include diff --git a/src/Lib/Geometry/poly_support.hxx b/src/Lib/Geometry/poly_support.hxx index d6fd40d3..77e8263c 100644 --- a/src/Lib/Geometry/poly_support.hxx +++ b/src/Lib/Geometry/poly_support.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include diff --git a/src/Lib/Geometry/trinodes.hxx b/src/Lib/Geometry/trinodes.hxx index 8259a63e..5a6285d2 100644 --- a/src/Lib/Geometry/trinodes.hxx +++ b/src/Lib/Geometry/trinodes.hxx @@ -31,8 +31,8 @@ #include -#include -#include +#include +#include diff --git a/src/Lib/Geometry/trisegs.cxx b/src/Lib/Geometry/trisegs.cxx index 9828c284..dad179bd 100644 --- a/src/Lib/Geometry/trisegs.cxx +++ b/src/Lib/Geometry/trisegs.cxx @@ -22,7 +22,7 @@ #include -#include +#include #include "trinodes.hxx" diff --git a/src/Lib/Optimize/genfans.hxx b/src/Lib/Optimize/genfans.hxx index c56af87a..2c8501de 100644 --- a/src/Lib/Optimize/genfans.hxx +++ b/src/Lib/Optimize/genfans.hxx @@ -34,7 +34,7 @@ #include -#include +#include #include diff --git a/src/Lib/Polygon/polygon.cxx b/src/Lib/Polygon/polygon.cxx index 1b340865..fb9c773c 100644 --- a/src/Lib/Polygon/polygon.cxx +++ b/src/Lib/Polygon/polygon.cxx @@ -30,7 +30,7 @@ extern "C" { } #include -#include +#include #include diff --git a/src/Lib/Polygon/polygon.hxx b/src/Lib/Polygon/polygon.hxx index d3f39eea..1a153719 100644 --- a/src/Lib/Polygon/polygon.hxx +++ b/src/Lib/Polygon/polygon.hxx @@ -31,7 +31,7 @@ #include -#include +#include #include #include diff --git a/src/Lib/Polygon/split.cxx b/src/Lib/Polygon/split.cxx index 1c1a0bc2..0030c958 100644 --- a/src/Lib/Polygon/split.cxx +++ b/src/Lib/Polygon/split.cxx @@ -25,8 +25,8 @@ #include STL_STRING -#include -#include +#include +#include #include "index.hxx" #include "names.hxx" diff --git a/src/Prep/DemChop/demchop.cxx b/src/Prep/DemChop/demchop.cxx index 38941606..b1c3674d 100644 --- a/src/Prep/DemChop/demchop.cxx +++ b/src/Prep/DemChop/demchop.cxx @@ -26,8 +26,8 @@ #include STL_STRING -#include -#include +#include +#include #include diff --git a/src/Prep/GSHHS/debug.cxx b/src/Prep/GSHHS/debug.cxx index e26d5c6a..4348bb9c 100644 --- a/src/Prep/GSHHS/debug.cxx +++ b/src/Prep/GSHHS/debug.cxx @@ -27,7 +27,7 @@ #include STL_STRING -#include +#include #include #include diff --git a/src/Prep/GSHHS/gshhs_split.cxx b/src/Prep/GSHHS/gshhs_split.cxx index 77d0c046..857e7c61 100644 --- a/src/Prep/GSHHS/gshhs_split.cxx +++ b/src/Prep/GSHHS/gshhs_split.cxx @@ -25,8 +25,8 @@ #include STL_STRING -#include -#include +#include +#include #include #include diff --git a/src/Prep/GSHHS/main.cxx b/src/Prep/GSHHS/main.cxx index 733209e4..c171880e 100644 --- a/src/Prep/GSHHS/main.cxx +++ b/src/Prep/GSHHS/main.cxx @@ -27,7 +27,7 @@ #include STL_STRING -#include +#include #include #include diff --git a/src/Prep/MergerClipper/merger.cxx b/src/Prep/MergerClipper/merger.cxx index b1c15547..5b7b4fa3 100644 --- a/src/Prep/MergerClipper/merger.cxx +++ b/src/Prep/MergerClipper/merger.cxx @@ -22,9 +22,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -------------------------------------------------------------------------- */ -#include #include -#include +#include +#include #include #include diff --git a/src/Prep/MergerClipper/merger.hxx b/src/Prep/MergerClipper/merger.hxx index 9b8264aa..654d7f14 100644 --- a/src/Prep/MergerClipper/merger.hxx +++ b/src/Prep/MergerClipper/merger.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include #include diff --git a/src/Prep/MergerClipper/testmerger.cxx b/src/Prep/MergerClipper/testmerger.cxx index 84bfa78e..69351ca2 100644 --- a/src/Prep/MergerClipper/testmerger.cxx +++ b/src/Prep/MergerClipper/testmerger.cxx @@ -22,8 +22,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -------------------------------------------------------------------------- */ -#include -#include +#include +#include #include #include "merger.hxx" diff --git a/src/Prep/ShapeFile/main.cxx b/src/Prep/ShapeFile/main.cxx index 2ce7fd60..da7bfb38 100644 --- a/src/Prep/ShapeFile/main.cxx +++ b/src/Prep/ShapeFile/main.cxx @@ -27,7 +27,7 @@ #include STL_STRING -#include +#include #include #include