diff options
| author | Lucas Wojciechowski <lucas@mapbox.com> | 2015-09-16 16:27:53 -0700 |
|---|---|---|
| committer | Lucas Wojciechowski <lucas@mapbox.com> | 2015-09-16 16:27:53 -0700 |
| commit | 311bf93abe9f815668e8e0a779c87c3eb5c1199d (patch) | |
| tree | 7ee70bba8d27f085881f083cd5d41b3bb6259485 /src | |
| parent | 8d322c65728ffe0d4f69fcd3b73b007a53eb505a (diff) | |
| download | qtlocation-mapboxgl-311bf93abe9f815668e8e0a779c87c3eb5c1199d.tar.gz | |
Revert "[node] Enable npm to build mapbox-gl-native package from source"
This reverts commit 4e1ead344bfb1f9ddb207924465fabae3d218d67.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/annotation.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/map/annotation.hpp | 3 | ||||
| m--------- | src/mbgl/util/geojsonvt | 0 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/map/annotation.cpp b/src/mbgl/map/annotation.cpp index 4bc01871b6..8744597975 100644 --- a/src/mbgl/map/annotation.cpp +++ b/src/mbgl/map/annotation.cpp @@ -1,11 +1,10 @@ -#include <mapbox/geojsonvt/geojsonvt_convert.hpp> - #include <mbgl/map/annotation.hpp> #include <mbgl/annotation/point_annotation.hpp> #include <mbgl/annotation/shape_annotation.hpp> #include <mbgl/map/tile_id.hpp> #include <mbgl/map/live_tile.hpp> #include <mbgl/util/constants.hpp> +#include <mbgl/util/geojsonvt/geojsonvt_convert.hpp> #include <mbgl/util/ptr.hpp> #include <mbgl/util/string.hpp> diff --git a/src/mbgl/map/annotation.hpp b/src/mbgl/map/annotation.hpp index 6b80d9f6c5..5adec162f7 100644 --- a/src/mbgl/map/annotation.hpp +++ b/src/mbgl/map/annotation.hpp @@ -1,14 +1,13 @@ #ifndef MBGL_MAP_ANNOTATIONS #define MBGL_MAP_ANNOTATIONS -#include <mapbox/geojsonvt/geojsonvt.hpp> - #include <mbgl/map/map.hpp> #include <mbgl/map/geometry_tile.hpp> #include <mbgl/map/tile_id.hpp> #include <mbgl/style/style_properties.hpp> #include <mbgl/style/types.hpp> #include <mbgl/util/geo.hpp> +#include <mbgl/util/geojsonvt/geojsonvt.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/vec.hpp> diff --git a/src/mbgl/util/geojsonvt b/src/mbgl/util/geojsonvt new file mode 160000 +Subproject 995ffc72c556da4b4880a6036fbcf7159fc5ecc |