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 /scripts/ios | |
| 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 'scripts/ios')
| -rw-r--r-- | scripts/ios/configure.sh | 2 | ||||
| -rwxr-xr-x | scripts/ios/package.sh | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/ios/configure.sh b/scripts/ios/configure.sh index 0562e0e39a..954ba34b1b 100644 --- a/scripts/ios/configure.sh +++ b/scripts/ios/configure.sh @@ -4,3 +4,5 @@ BOOST_VERSION=1.57.0 SQLITE_VERSION=system LIBUV_VERSION=0.10.28 ZLIB_VERSION=system +GEOJSONVT_VERSION=1.1.0 +VARIANT_VERSION=1.0 diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 2b1e97c304..3d21bacb5a 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -74,12 +74,14 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then -o ${OUTPUT}/static/lib${NAME}.a \ ${LIBS[@]/#/build/${BUILDTYPE}-iphoneos/libmbgl-} \ ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` else libtool -static -no_warning_for_no_symbols \ -o ${OUTPUT}/static/lib${NAME}.a \ ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` fi echo "Created ${OUTPUT}/static/lib${NAME}.a" |