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 /gyp | |
| 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 'gyp')
| -rw-r--r-- | gyp/core.gypi | 5 | ||||
| -rw-r--r-- | gyp/version.gypi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index f9b361032e..51009be698 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -31,10 +31,14 @@ '<@(libuv_cflags)', '<@(opengl_cflags)', '<@(boost_cflags)', + '<@(geojsonvt_cflags)', + '<@(variant_cflags)', ], 'cflags': [ '<@(libuv_cflags)', '<@(opengl_cflags)', + '<@(geojsonvt_cflags)', + '<@(variant_cflags)', '-fPIC' ], 'ldflags': [ @@ -43,6 +47,7 @@ ], 'libraries': [ '<@(libuv_static_libs)', + '<@(geojsonvt_static_libs)', ], }, diff --git a/gyp/version.gypi b/gyp/version.gypi index 1cc2eb351f..4efdd079a8 100644 --- a/gyp/version.gypi +++ b/gyp/version.gypi @@ -13,7 +13,7 @@ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp', ], - 'action': ['<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)', '<!@(git describe --tags --always --abbrev=0)', '<!@(git rev-parse HEAD)'], + 'action': ['<@(_inputs)', '<(SHARED_INTERMEDIATE_DIR)'], } ], 'direct_dependent_settings': { |