diff options
author | Vladimir Agafonkin <agafonkin@gmail.com> | 2016-07-18 16:21:28 +0300 |
---|---|---|
committer | Vladimir Agafonkin <agafonkin@gmail.com> | 2016-07-18 16:21:28 +0300 |
commit | f84e9fdb2bb25d88f4dbe6f269ca66c7eee8eeb2 (patch) | |
tree | f7ed08b124942eb46ae7d1103093e19c543facf6 | |
parent | 3fd874de8d0e49d8a7ae3c57eefad3c69a16b65b (diff) | |
download | qtlocation-mapboxgl-f84e9fdb2bb25d88f4dbe6f269ca66c7eee8eeb2.tar.gz |
add supercluster dependency
[skip ci]
m--------- | .mason | 0 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | mbgl.gypi | 2 | ||||
-rw-r--r-- | platform/android/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/ios/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/linux/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/macos/scripts/configure.sh | 2 | ||||
-rw-r--r-- | platform/qt/scripts/configure.sh | 2 | ||||
-rw-r--r-- | test/test.gypi | 5 |
9 files changed, 18 insertions, 3 deletions
diff --git a/.mason b/.mason -Subproject 39ed569b3a3dc1197bc00d423c63800c25dc17f +Subproject 0168c417977431d530839c47b96f64a365229a1 @@ -119,7 +119,9 @@ print_flags nunicode static_libs cflags ldflags print_flags libzip static_libs cflags ldflags print_flags geometry cflags print_flags geojson static_libs cflags ldflags -print_flags geojsonvt static_libs cflags ldflags +print_flags geojsonvt cflags +print_flags supercluster cflags +print_flags kdbush cflags print_flags variant cflags print_flags rapidjson static_libs cflags ldflags print_flags gtest static_libs cflags ldflags @@ -196,6 +196,8 @@ '<@(geometry_cflags)', '<@(geojson_cflags)', '<@(geojsonvt_cflags)', + '<@(supercluster_cflags)', + '<@(kdbush_cflags)', '<@(rapidjson_cflags)', '<@(variant_cflags)', '<@(earcut_cflags)', diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index a9a5b25ff7..40a09f3d52 100644 --- a/platform/android/scripts/configure.sh +++ b/platform/android/scripts/configure.sh @@ -12,6 +12,8 @@ LIBZIP_VERSION=0.11.2 GEOMETRY_VERSION=0.8.0 GEOJSON_VERSION=0.1.4 GEOJSONVT_VERSION=6.1.0 +SUPERCLUSTER_VERSION=0.1.0 +KDBUSH_VERSION=0.1.0 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 JNI_HPP_VERSION=2.0.0 diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh index a0791e3108..13ed9a852b 100644 --- a/platform/ios/scripts/configure.sh +++ b/platform/ios/scripts/configure.sh @@ -8,6 +8,8 @@ ZLIB_VERSION=system GEOMETRY_VERSION=0.8.0 GEOJSON_VERSION=0.1.4 GEOJSONVT_VERSION=6.1.0 +SUPERCLUSTER_VERSION=0.1.0 +KDBUSH_VERSION=0.1.0 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index c4f6dc606d..47c9a308fb 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -17,6 +17,8 @@ NUNICODE_VERSION=1.6 GEOMETRY_VERSION=0.8.0 GEOJSON_VERSION=0.1.4${CXX11ABI:-} GEOJSONVT_VERSION=6.1.0 +SUPERCLUSTER_VERSION=0.1.0 +KDBUSH_VERSION=0.1.0 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0${CXX11ABI:-} diff --git a/platform/macos/scripts/configure.sh b/platform/macos/scripts/configure.sh index 47d9b381ba..7141df9efd 100644 --- a/platform/macos/scripts/configure.sh +++ b/platform/macos/scripts/configure.sh @@ -11,6 +11,8 @@ NUNICODE_VERSION=1.6 GEOMETRY_VERSION=0.8.0 GEOJSON_VERSION=0.1.4 GEOJSONVT_VERSION=6.1.0 +SUPERCLUSTER_VERSION=0.1.0 +KDBUSH_VERSION=0.1.0 VARIANT_VERSION=1.1.0 RAPIDJSON_VERSION=1.0.2 GTEST_VERSION=1.7.0 diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 42541032c0..9d30c6438d 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -8,6 +8,8 @@ BOOST_VERSION=1.60.0 GEOMETRY_VERSION=0.8.0 GEOJSON_VERSION=0.1.4${CXX11ABI:-} GEOJSONVT_VERSION=6.1.0 +SUPERCLUSTER_VERSION=0.1.0 +KDBUSH_VERSION=0.1.0 GTEST_VERSION=1.7.0${CXX11ABI:-} LIBJPEG_TURBO_VERSION=1.4.2 NUNICODE_VERSION=1.6 diff --git a/test/test.gypi b/test/test.gypi index 304e0e9730..82bd02bd83 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -103,6 +103,8 @@ '<@(boost_cflags)', '<@(sqlite_cflags)', '<@(geojsonvt_cflags)', + '<@(supercluster_cflags)', + '<@(kdbush_cflags)', '<@(rapidjson_cflags)', '<@(pixelmatch_cflags)', '<@(earcut_cflags)', @@ -113,8 +115,7 @@ ], 'libraries': [ '<@(gtest_static_libs)', - '<@(sqlite_static_libs)', - '<@(geojsonvt_static_libs)', + '<@(sqlite_static_libs)' ], }, |