ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-06-15 22:08:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move jsonpull into a subdirectory like other included libraries

Browse Source
This commit is contained in:
Eric Fischer
2016-04-27 15:33:30 -07:00
parent 48a82039ce
commit 2b393ad8e5
7 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 1.11.0
* Convert C source files to C++
## 1.10.0 ## 1.10.0
* Upgrade Clipper to fix potential crashes and improve polygon topology * Upgrade Clipper to fix potential crashes and improve polygon topology

13
Makefile
View File

@ -42,7 +42,7 @@ C = $(wildcard *.c) $(wildcard *.cpp)
INCLUDES = -I/usr/local/include -I. INCLUDES = -I/usr/local/include -I.
LIBS = -L/usr/local/lib LIBS = -L/usr/local/lib
tippecanoe: geojson.o jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o clipper.o mvt.o serial.o main.o tippecanoe: geojson.o jsonpull/jsonpull.o tile.o pool.o mbtiles.o geometry.o projection.o memfile.o clipper/clipper.o mvt.o serial.o main.o
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread $(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 -lpthread
tippecanoe-enumerate: enumerate.o tippecanoe-enumerate: enumerate.o
@ -54,18 +54,11 @@ tippecanoe-decode: decode.o projection.o mvt.o
tile-join: tile-join.o projection.o pool.o mbtiles.o mvt.o memfile.o tile-join: tile-join.o projection.o pool.o mbtiles.o mvt.o memfile.o
$(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 $(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3
libjsonpull.a: jsonpull.o
$(AR) rc $@ $^
ranlib $@
%.o: %.c $(H) %.o: %.c $(H)
$(CC) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CFLAGS) -c $< $(CC) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CFLAGS) -c -o $@ $<
%.o: %.cpp $(H) %.o: %.cpp $(H)
$(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c $< $(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c -o $@ $<
clipper.o: clipper/clipper.cpp $(H)
$(CXX) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CXXFLAGS) -c $<
clean: clean:
rm -f tippecanoe *.o rm -f tippecanoe *.o

2
geojson.cpp
View File

@ -22,7 +22,7 @@
#include <vector> #include <vector>
extern "C" { extern "C" {
#include "jsonpull.h" #include "jsonpull/jsonpull.h"
} }
#include "pool.hpp" #include "pool.hpp"

0
jsonpull.c → jsonpull/jsonpull.c
View File

0
jsonpull.h → jsonpull/jsonpull.h
View File

2
main.cpp
View File

@ -32,7 +32,7 @@
#endif #endif
extern "C" { extern "C" {
#include "jsonpull.h" #include "jsonpull/jsonpull.h"
} }
#include "tile.hpp" #include "tile.hpp"

2
version.hpp
View File

@ -1 +1 @@
#define VERSION "tippecanoe v1.10.0\n" #define VERSION "tippecanoe v1.11.0\n"