summaryrefslogtreecommitdiff
path: root/scripts/ios
diff options
context:
space:
mode:
authorLucas Wojciechowski <lucas@mapbox.com>2015-09-16 16:27:53 -0700
committerLucas Wojciechowski <lucas@mapbox.com>2015-09-16 16:27:53 -0700
commit311bf93abe9f815668e8e0a779c87c3eb5c1199d (patch)
tree7ee70bba8d27f085881f083cd5d41b3bb6259485 /scripts/ios
parent8d322c65728ffe0d4f69fcd3b73b007a53eb505a (diff)
downloadqtlocation-mapboxgl-311bf93abe9f815668e8e0a779c87c3eb5c1199d.tar.gz
Revert "[node] Enable npm to build mapbox-gl-native package from source"
This reverts commit 4e1ead344bfb1f9ddb207924465fabae3d218d67.
Diffstat (limited to 'scripts/ios')
-rw-r--r--scripts/ios/configure.sh2
-rwxr-xr-xscripts/ios/package.sh6
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/ios/configure.sh b/scripts/ios/configure.sh
index 954ba34b1b..0562e0e39a 100644
--- a/scripts/ios/configure.sh
+++ b/scripts/ios/configure.sh
@@ -4,5 +4,3 @@ 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 3d21bacb5a..2b1e97c304 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -74,14 +74,12 @@ 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 libgeojsonvt.a`
+ `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.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 libgeojsonvt.a`
+ `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
fi
echo "Created ${OUTPUT}/static/lib${NAME}.a"