| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869 |
- --- a/configure.in 2017-01-02 06:05:19.000000000 +0100
- +++ b/configure.in 2017-01-21 00:26:02.239786037 +0100
- @@ -402,7 +402,7 @@
- AC_SUBST(QT_SYSINC_OPT)
- AC_SUBST(QT_LIBS)
-
- -AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
- +AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
- AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
- AC_OUTPUT
-
- --- a/Makefile.in 2017-01-02 06:05:19.000000000 +0100
- +++ b/Makefile.in 2017-01-21 00:29:05.715731486 +0100
- @@ -100,7 +100,7 @@
- # Extra modules in Jeeps that we don't use
- # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
-
- -SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
- +SHAPE=-lshp
-
- MINIZIP=zlib/contrib/minizip/zip.o \
- zlib/contrib/minizip/ioapi.o
- @@ -119,7 +119,7 @@
- src/core/xmlstreamwriter.o \
- src/core/usasciicodec.o\
- src/core/ziparchive.o \
- - $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
- + $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
- OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
-
- DEPFILES = $(OBJS:.o=.d)
- @@ -148,10 +148,10 @@
- all: gpsbabel$(EXEEXT)
-
- gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
- - $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
- + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- gpsbabel-debug: $(OBJS)
- - $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
- + $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
-
- Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
- gbversion.h.in gui/setup.iss.in
- @@ -894,11 +894,7 @@
- session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- gbfile.h cet.h inifile.h session.h src/core/datetime.h
- shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- - gbfile.h cet.h inifile.h session.h src/core/datetime.h \
- - shapelib/shapefil.h
- -shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
- -shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
- -shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
- + gbfile.h cet.h inifile.h session.h src/core/datetime.h
- skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- gbfile.h cet.h inifile.h session.h src/core/datetime.h
- skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
- --- a/shape.cc 2017-01-02 06:05:19.000000000 +0100
- +++ b/shape.cc 2017-01-21 00:29:58.514391517 +0100
- @@ -20,7 +20,7 @@
-
- */
- #include "defs.h"
- -#include "shapelib/shapefil.h"
- +#include <libshp/shapefil.h>
- #include <stdlib.h>
-
- #if SHAPELIB_ENABLED
|
