diff options
| author | Young Hahn <young@mapbox.com> | 2016-07-06 17:29:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 17:29:34 -0400 |
| commit | 71a3b1d0db170cfc1786be88c3e7b286c50dece9 (patch) | |
| tree | 1d51cc28946dc990f8f613795417cb76ea8c00df /platform/ios/scripts | |
| parent | 903d609b40b6d0f4873f7bb46d96f4a06d7b17d6 (diff) | |
| download | qtlocation-mapboxgl-71a3b1d0db170cfc1786be88c3e7b286c50dece9.tar.gz | |
[core] geometry@0.8.0 / geojsonvt@6.0.0 (#5514)
* [core] geometry.hpp 0.8.0
* geojsonvt @ 6.0.0
* Update platform deps, build scripts
* Perf optimizations/cleanup
* Rebase in geometry@080
* D.R.Y. etc
* Ensure fill annotation geometries have closed rings.
* Optimizations
* Update to geojsonvt @ 6.1.0 for clean handoff between geojson parsing and geojsonvt
* Apply close multi/poly geoms for line annotations as well
Diffstat (limited to 'platform/ios/scripts')
| -rw-r--r-- | platform/ios/scripts/configure.sh | 5 | ||||
| -rwxr-xr-x | platform/ios/scripts/package.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh index 408180881c..a0791e3108 100644 --- a/platform/ios/scripts/configure.sh +++ b/platform/ios/scripts/configure.sh @@ -5,8 +5,9 @@ PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 SQLITE_VERSION=system ZLIB_VERSION=system -GEOMETRY_VERSION=0.5.0 -GEOJSONVT_VERSION=4.1.2 +GEOMETRY_VERSION=0.8.0 +GEOJSON_VERSION=0.1.4 +GEOJSONVT_VERSION=6.1.0 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index f0ca683389..8bc2a3fd63 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -119,7 +119,7 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then -o ${OUTPUT}/static/${NAME}.framework/${NAME} \ ${LIBS[@]/#/${PRODUCTS}/${BUILDTYPE}-iphoneos/lib} \ ${LIBS[@]/#/${PRODUCTS}/${BUILDTYPE}-iphonesimulator/lib} \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojson.a` cp -rv ${PRODUCTS}/${BUILDTYPE}-iphoneos/${NAME}.bundle ${STATIC_BUNDLE_DIR} fi @@ -149,7 +149,7 @@ else libtool -static -no_warning_for_no_symbols \ -o ${OUTPUT}/static/${NAME}.framework/${NAME} \ ${LIBS[@]/#/${PRODUCTS}/${BUILDTYPE}-iphonesimulator/lib} \ - `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojson.a` cp -rv ${PRODUCTS}/${BUILDTYPE}-iphonesimulator/${NAME}.bundle ${STATIC_BUNDLE_DIR} fi |