Renamed libgpc to libgenpolyclip to avoid a conflict with the gnu pascal
compiler.
This commit is contained in:
parent
f1f5e14db1
commit
19d9392863
8 changed files with 10 additions and 10 deletions
|
@ -40,7 +40,7 @@ genapts_LDADD = \
|
|||
$(top_builddir)/src/Lib/Geometry/libGeometry.a \
|
||||
$(top_builddir)/src/Lib/Output/libOutput.a \
|
||||
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
|
||||
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \
|
||||
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgenpolyclip \
|
||||
$(base_LIBS)
|
||||
|
||||
INCLUDES += \
|
||||
|
|
|
@ -13,6 +13,6 @@ testclipper_LDADD = \
|
|||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/landcover/liblandcover.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
-lsgbucket -lsgdebug -lsgmisc -lz -lgpc
|
||||
-lsgbucket -lsgdebug -lsgmisc -lz -lgenpolyclip
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles
|
||||
|
|
|
@ -18,7 +18,7 @@ fgfs_construct_LDADD = \
|
|||
$(top_builddir)/src/Lib/landcover/liblandcover.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
|
||||
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lplibsg -lz -lgpc
|
||||
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lplibsg -lz -lgenpolyclip
|
||||
|
||||
fgfs_master_SOURCES = master.cxx
|
||||
|
||||
|
|
|
@ -6,6 +6,6 @@ e00lines_LDADD = \
|
|||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
$(top_builddir)/src/Lib/e00/libe00.a \
|
||||
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lz -lgpc
|
||||
-lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lz -lgenpolyclip
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/src/Lib
|
||||
|
|
|
@ -8,7 +8,7 @@ gshhs_SOURCES = \
|
|||
gshhs_LDADD = \
|
||||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
|
||||
|
||||
debug_SOURCES = \
|
||||
debug.cxx
|
||||
|
@ -16,6 +16,6 @@ debug_SOURCES = \
|
|||
debug_LDADD = \
|
||||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
|
||||
|
|
|
@ -10,6 +10,6 @@ testmerger_LDADD = \
|
|||
$(top_builddir)/src/Prep/MergerClipper/libMergerClipper.a \
|
||||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/src/Lib
|
||||
|
|
|
@ -36,7 +36,7 @@ photo_LDADD = \
|
|||
$(top_builddir)/src/Lib/Geometry/libGeometry.a \
|
||||
$(top_builddir)/src/Lib/Output/libOutput.a \
|
||||
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
|
||||
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \
|
||||
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgenpolyclip \
|
||||
$(base_LIBS)
|
||||
|
||||
wgs84offset_SOURCES = wgs84offset.cxx
|
||||
|
|
|
@ -8,12 +8,12 @@ shape_decode_LDADD = \
|
|||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
$(top_builddir)/src/Lib/shapelib/libshape.a \
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
|
||||
|
||||
noaa_decode_LDADD = \
|
||||
$(top_builddir)/src/Lib/Polygon/libPolygon.a \
|
||||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
$(top_builddir)/src/Lib/shapelib/libshape.a \
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgpc
|
||||
-lsgdebug -lsgbucket -lsgmisc -lz -lgenpolyclip
|
||||
|
||||
INCLUDES += -I$(top_srcdir)/src/Lib
|
||||
|
|
Loading…
Add table
Reference in a new issue