From 083a28065906f063e12a4392184d9452d07b2409 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 20 Sep 2016 16:00:03 -0700 Subject: [PATCH] Fix build errors on Linux (pthread library, signed comparison) --- Makefile | 2 +- tile-join.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2badea3b..704b0d3e 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ tippecanoe-decode: decode.o projection.o mvt.o $(CXX) $(PG) $(LIBS) $(FINAL_FLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) -lm -lz -lsqlite3 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 -lpthread %.o: %.c $(ALL_H) $(CC) $(PG) $(INCLUDES) $(FINAL_FLAGS) $(CFLAGS) -c -o $@ $< diff --git a/tile-join.cpp b/tile-join.cpp index 4bc77989..ab4a300f 100644 --- a/tile-join.cpp +++ b/tile-join.cpp @@ -20,7 +20,7 @@ std::string dequote(std::string s); bool pk = false; -int CPUS; +size_t CPUS; struct stats { int minzoom; @@ -414,7 +414,7 @@ void handle_tasks(std::map> &tasks, std::vector