Explicitly use /usr/local, as Yosemite apparently needs

This commit is contained in:
Eric Fischer 2014-11-15 23:46:39 -08:00
parent a1769416d1
commit 82c0f67813

View File

@ -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