diff options
| author | Leith Bade <leith@mapbox.com> | 2014-11-17 19:23:36 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-11-17 19:23:36 +1100 |
| commit | c092a686a7d898fef5d1436d49d36b4129af11ee (patch) | |
| tree | 3aa80bd74481810f32951663fe8984355fe981f2 | |
| parent | d957d65bef158c056f80163f5609be216fb134a8 (diff) | |
| download | qtlocation-mapboxgl-c092a686a7d898fef5d1436d49d36b4129af11ee.tar.gz | |
Add libzip
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | gyp/mbgl-android.gypi | 2 |
2 files changed, 9 insertions, 0 deletions
@@ -33,6 +33,7 @@ case ${MASON_PLATFORM} in ZLIB_VERSION=system BOOST_VERSION=1.57.0 NUNICODE_VERSION=1.4 + LIBZIP_VERSION=0.11.2 ;; *) GLFW_VERSION=a21f2377 @@ -136,6 +137,12 @@ if [ ! -z ${NUNICODE_VERSION} ]; then CONFIG+=" 'nu_ldflags': $(quote_flags $(mason ldflags nunicode ${NUNICODE_VERSION})),"$LN fi +if [ ! -z ${LIBZIP_VERSION} ]; then + mason install libzip ${LIBZIP_VERSION} + CONFIG+=" 'zip_static_libs': $(quote_flags $(mason static_libs libzip ${LIBZIP_VERSION})),"$LN + CONFIG+=" 'zip_cflags': $(quote_flags $(mason cflags libzip ${LIBZIP_VERSION})),"$LN + CONFIG+=" 'zip_ldflags': $(quote_flags $(mason ldflags libzip ${LIBZIP_VERSION})),"$LN +fi CONFIG+=" } } diff --git a/gyp/mbgl-android.gypi b/gyp/mbgl-android.gypi index 4601ead478..473e85fe7a 100644 --- a/gyp/mbgl-android.gypi +++ b/gyp/mbgl-android.gypi @@ -11,6 +11,7 @@ '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', + '<@(zip_cflags)', '-I<(boost_root)/include', ], 'cflags': [ @@ -22,6 +23,7 @@ '<@(uv_ldflags)', '<@(curl_ldflags)', '<@(nu_ldflags)', + '<@(zip_ldflags)', ], }, 'sources': [ |