fly/terragear
1
0
Fork 0
Code Activity

Updates to track recent changes in simgear.

Browse source
This commit is contained in:
curt 2003-11-12 22:16:22 +00:00
parent f2382f77a1
commit e8bcdaa4d0
18 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Airports/GenAirports/Makefile.am
View file

@ -50,8 +50,9 @@ genapts_LDADD = \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/Output/libOutput.a \ $(top_builddir)/src/Lib/Output/libOutput.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgxml -lgenpolyclip \ -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \
-lnurbsf -lmatrixI -lmatrixN -lmatrix \ -lgenpolyclip \
-lnurbsf -lmatrixI -lmatrixN -lmatrix \
-lz \ -lz \
$(base_LIBS) $(base_LIBS)

2
src/Airports/GenAirports/build.cxx
View file

@ -29,7 +29,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> // for atoi() atof() #include <stdlib.h> // for atoi() atof()

2
src/Airports/GenAirports/convex_hull.cxx
View file

@ -32,7 +32,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
SG_USING_STD(less); SG_USING_STD(less);
SG_USING_STD(map); SG_USING_STD(map);

2
src/Airports/GenAirports/main.cxx
View file

@ -27,7 +27,7 @@
#endif #endif
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
#include <stdlib.h> #include <stdlib.h>

3
src/BuildTiles/Clipper/Makefile.am
View file

@ -15,6 +15,7 @@ testclipper_LDADD = \
$(top_builddir)/src/Lib/landcover/liblandcover.a \ $(top_builddir)/src/Lib/landcover/liblandcover.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgdebug -lsgmisc -lsgxml -lgenpolyclip -lz -lsgbucket -lsgdebug -lsgmisc -lsgstructure -lsgxml \
-lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles

2
src/BuildTiles/Main/Makefile.am
View file

@ -18,7 +18,7 @@ fgfs_construct_LDADD = \
$(top_builddir)/src/Lib/landcover/liblandcover.a \ $(top_builddir)/src/Lib/landcover/liblandcover.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgxml \ -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgstructure -lsgxml \
-lplibsg -lplibul -lgenpolyclip -lz -lplibsg -lplibul -lgenpolyclip -lz
fgfs_master_SOURCES = master.cxx fgfs_master_SOURCES = master.cxx

2
src/Lib/Geometry/util.cxx
View file

@ -8,7 +8,7 @@
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>

2
src/Lib/Polygon/polygon.cxx
View file

@ -32,7 +32,7 @@ extern "C" {
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/math/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
SG_USING_STD(endl); SG_USING_STD(endl);

2
src/Lib/Polygon/simple_clip.cxx
View file

@ -26,7 +26,7 @@
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
#include "simple_clip.hxx" #include "simple_clip.hxx"

2
src/Lib/Polygon/split-bin.cxx
View file

@ -30,7 +30,7 @@
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <simgear/misc/exception.hxx> #include <simgear/structure/exception.hxx>
#ifdef _MSC_VER #ifdef _MSC_VER
# include <win32/mkdir.hpp> # include <win32/mkdir.hpp>

3
src/Prep/E00Lines/Makefile.am
View file

@ -8,6 +8,7 @@ e00lines_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
$(top_builddir)/src/Lib/e00/libe00.a \ $(top_builddir)/src/Lib/e00/libe00.a \
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \
-lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

4
src/Prep/GSHHS/Makefile.am
View file

@ -9,7 +9,7 @@ gshhs_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz
debug_SOURCES = \ debug_SOURCES = \
debug.cxx debug.cxx
@ -18,6 +18,6 @@ debug_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib

2
src/Prep/MergerClipper/Makefile.am
View file

@ -12,6 +12,6 @@ testmerger_LDADD = \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

3
src/Prep/Photo/Makefile.am
View file

@ -36,7 +36,8 @@ photo_LDADD = \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/Output/libOutput.a \ $(top_builddir)/src/Lib/Output/libOutput.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgxml -lgenpolyclip -lz -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \
-lgenpolyclip -lz
$(base_LIBS) $(base_LIBS)
wgs84offset_SOURCES = wgs84offset.cxx wgs84offset_SOURCES = wgs84offset.cxx

4
src/Prep/ShapeFile/Makefile.am
View file

@ -10,7 +10,7 @@ shape_decode_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/shapelib/libshape.a \ $(top_builddir)/src/Lib/shapelib/libshape.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz
noaa_decode_LDADD = \ noaa_decode_LDADD = \
$(top_builddir)/src/Lib/Polygon/libPolygon.a \ $(top_builddir)/src/Lib/Polygon/libPolygon.a \
@ -18,6 +18,6 @@ noaa_decode_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/shapelib/libshape.a \ $(top_builddir)/src/Lib/shapelib/libshape.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgdebug -lsgbucket -lsgmisc -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgstructure -lsgxml -lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

3
src/Prep/TGVPF/Makefile.am
View file

@ -8,6 +8,7 @@ tgvpf_LDADD = \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
$(top_builddir)/src/Lib/vpf/libvpf.a \ $(top_builddir)/src/Lib/vpf/libvpf.a \
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgxml -lgenpolyclip -lz -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \
-lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

3
src/Prep/UserDef/Makefile.am
View file

@ -7,7 +7,8 @@ tguserdef_LDADD = \
$(top_builddir)/src/Lib/Geometry/libGeometry.a \ $(top_builddir)/src/Lib/Geometry/libGeometry.a \
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \ $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \ $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
-lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgxml -lsgdebug \ -lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgstructure -lsgxml \
-lsgdebug \
-lgenpolyclip -lz -lgenpolyclip -lz
INCLUDES = -I$(top_srcdir)/src/Lib INCLUDES = -I$(top_srcdir)/src/Lib

2
src/Prep/UserDef/tguserdef.cxx
View file

@ -4,9 +4,9 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/math/point3d.hxx> #include <simgear/math/point3d.hxx>
#include <simgear/misc/exception.hxx>
#include <simgear/props/props_io.hxx> #include <simgear/props/props_io.hxx>
#include <simgear/props/props.hxx> #include <simgear/props/props.hxx>
#include <simgear/structure/exception.hxx>
#include <Geometry/util.hxx> #include <Geometry/util.hxx>
#include <Polygon/index.hxx> #include <Polygon/index.hxx>