[ios] libtool smush libgeojsonvt.a

add libuv and geojsonvt first in libtool smush use visibility-default geojsonvt branch
mapbox · Oct 31, 2015 · 6da2367 · 6da2367
1 parent c815bda
commit 6da2367
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/scripts/android/configure.sh b/scripts/android/configure.sh
@@ -10,7 +10,7 @@ LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=0.11.2
-GEOJSONVT_VERSION=2.1.6.2
+GEOJSONVT_VERSION=visibility-default
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 

diff --git a/scripts/ios/configure.sh b/scripts/ios/configure.sh
@@ -4,6 +4,6 @@ BOOST_VERSION=1.59.0
 SQLITE_VERSION=system
 LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
-GEOJSONVT_VERSION=2.1.6.2
+GEOJSONVT_VERSION=visibility-default
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
@@ -74,15 +74,17 @@ step "Building static library..."
 LIBS=(core.a platform-ios.a asset-fs.a cache-sqlite.a http-nsurl.a)
 if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
     libtool -static -no_warning_for_no_symbols \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \
         -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`
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
 else
     libtool -static -no_warning_for_no_symbols \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a` \
+        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libgeojsonvt.a` \
         -o ${OUTPUT}/static/lib${NAME}.a \
-        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-} \
-        `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libuv.a`
+        ${LIBS[@]/#/build/${BUILDTYPE}-iphonesimulator/libmbgl-}
 fi
 echo "Created ${OUTPUT}/static/lib${NAME}.a"
 

diff --git a/scripts/linux/configure.sh b/scripts/linux/configure.sh
@@ -11,7 +11,7 @@ LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=1.0.1
-GEOJSONVT_VERSION=2.1.6.2
+GEOJSONVT_VERSION=visibility-default
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0

diff --git a/scripts/osx/configure.sh b/scripts/osx/configure.sh
@@ -11,7 +11,7 @@ LIBUV_VERSION=1.7.5
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=1.0.1
-GEOJSONVT_VERSION=2.1.6.2
+GEOJSONVT_VERSION=visibility-default
 VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0