diff options
| author | Lucas Wojciechowski <lucas@mapbox.com> | 2015-09-02 13:38:37 -0700 |
|---|---|---|
| committer | Lucas Wojciechowski <lucas@mapbox.com> | 2015-09-15 11:17:53 -0700 |
| commit | 4e1ead344bfb1f9ddb207924465fabae3d218d67 (patch) | |
| tree | af358c06302f77ad30cd641bb2d915325d72d535 /src/mbgl | |
| parent | c1d229280942778e43cce014f3c761db09d191d1 (diff) | |
| download | qtlocation-mapboxgl-4e1ead344bfb1f9ddb207924465fabae3d218d67.tar.gz | |
[node] Enable npm to build mapbox-gl-native package from source
- Allow node bindings to be built if git submodules cannot be checked out
- Made geojsonvt a mason package instead of a git submodule
- Use globally installed mason if it cannot be checked out via git submodules
Diffstat (limited to 'src/mbgl')
| -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, 4 insertions, 2 deletions
diff --git a/src/mbgl/map/annotation.cpp b/src/mbgl/map/annotation.cpp index 8744597975..4bc01871b6 100644 --- a/src/mbgl/map/annotation.cpp +++ b/src/mbgl/map/annotation.cpp @@ -1,10 +1,11 @@ +#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 5adec162f7..6b80d9f6c5 100644 --- a/src/mbgl/map/annotation.hpp +++ b/src/mbgl/map/annotation.hpp @@ -1,13 +1,14 @@ #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 deleted file mode 160000 -Subproject 995ffc72c556da4b4880a6036fbcf7159fc5ecc |