diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-01-19 16:30:16 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-01-26 13:13:08 +0200 |
| commit | 70966b060115706a0620a6122916b2a995badd8a (patch) | |
| tree | 5d2a04a20404cebdba1b6e97e92c1754b3030ce5 | |
| parent | 4e4da69aa19784ce5a672805e9616fade8684612 (diff) | |
| download | qtlocation-mapboxgl-70966b060115706a0620a6122916b2a995badd8a.tar.gz | |
[ios] Added WebP build deps
| -rw-r--r-- | gyp/platform-ios.gypi | 4 | ||||
| -rw-r--r-- | platform/ios/scripts/configure.sh | 1 | ||||
| -rwxr-xr-x | platform/ios/scripts/package.sh | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index aab82387ed..0f0039fb0c 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -19,6 +19,7 @@ '../platform/default/sqlite_cache.cpp', '../platform/default/sqlite3.hpp', '../platform/default/sqlite3.cpp', + '../platform/default/webp_reader.cpp', '../platform/darwin/log_nslog.mm', '../platform/darwin/string_nsstring.mm', '../platform/darwin/application_root.mm', @@ -72,15 +73,18 @@ '<@(variant_cflags)', '<@(sqlite_cflags)', '<@(zlib_cflags)', + '<@(webp_cflags)', ], 'ldflags': [ '<@(sqlite_ldflags)', '<@(zlib_ldflags)', + '<@(webp_ldflags)', ], 'libraries': [ '<@(libuv_static_libs)', '<@(sqlite_static_libs)', '<@(zlib_static_libs)', + '<@(webp_static_libs)', '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', '$(SDKROOT)/System/Library/Frameworks/CoreLocation.framework', '$(SDKROOT)/System/Library/Frameworks/GLKit.framework', diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh index ee6d60de2f..5baedecf39 100644 --- a/platform/ios/scripts/configure.sh +++ b/platform/ios/scripts/configure.sh @@ -7,3 +7,4 @@ ZLIB_VERSION=system GEOJSONVT_VERSION=3.1.0 VARIANT_VERSION=1.0 RAPIDJSON_VERSION=1.0.2 +WEBP_VERSION=0.5.0 diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index 97f0c74fc7..f6f2d27d11 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -131,6 +131,7 @@ 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` \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libwebp.a` \ -o ${OUTPUT}/static/${NAME}.framework/${NAME} \ ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphoneos/libmbgl-} \ ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} @@ -155,6 +156,7 @@ 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` \ + `find mason_packages/ios-${IOS_SDK_VERSION} -type f -name libwebp.a` \ -o ${OUTPUT}/static/${NAME}.framework/${NAME} \ ${LIBS[@]/#/gyp/build/${BUILDTYPE}-iphonesimulator/libmbgl-} fi |