From 82c0f67813c56459f4f989dfb06763a29bce0d85 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Sat, 15 Nov 2014 23:46:39 -0800 Subject: [PATCH] Explicitly use /usr/local, as Yosemite apparently needs --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e024f1e..6bc3b88 100644 --- a/Makefile +++ b/Makefile @@ -12,24 +12,27 @@ PG= H = $(shell find . '(' -name '*.h' -o -name '*.hh' ')') +INCLUDES = -I/usr/local/include +LIBS = -L/usr/local/lib + tippecanoe: geojson.o jsonpull.o vector_tile.pb.o tile.o clip.o pool.o mbtiles.o geometry.o projection.o - g++ $(PG) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 + g++ $(PG) $(LIBS) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 enumerate: enumerate.o - gcc $(PG) -O3 -g -Wall -o $@ $^ -lsqlite3 + gcc $(PG) $(LIBS) -O3 -g -Wall -o $@ $^ -lsqlite3 decode: decode.o vector_tile.pb.o projection.o - g++ $(PG) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 + g++ $(PG) $(LIBS) -O3 -g -Wall -o $@ $^ -lm -lz -lprotobuf-lite -lsqlite3 libjsonpull.a: jsonpull.o ar rc $@ $^ ranlib $@ %.o: %.c $(H) - cc $(PG) -O3 -g -Wall -c $< + cc $(PG) $(INCLUDES) -O3 -g -Wall -c $< %.o: %.cc $(H) - g++ $(PG) -O3 -g -Wall -c $< + g++ $(PG) $(INCLUDES) -O3 -g -Wall -c $< clean: rm tippecanoe *.o