Revert "add supercluster dependency"

This reverts commit f84e9fdb2b.
2016-07-18 16:58:32 +03:00
parent f84e9fdb2b
commit a9e4e98e8e
9 changed files with 4 additions and 19 deletions
--- a/.mason
+++ b/.mason
--- a/4
+++ b/4
@@ -119,9 +119,7 @@ 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 cflags
-print_flags supercluster cflags
-print_flags kdbush cflags
+print_flags geojsonvt static_libs cflags ldflags
 print_flags variant cflags
 print_flags rapidjson static_libs cflags ldflags
 print_flags gtest static_libs cflags ldflags
--- a/mbgl.gypi
+++ b/mbgl.gypi
@@ -196,8 +196,6 @@
          '<@(geometry_cflags)',
          '<@(geojson_cflags)',
          '<@(geojsonvt_cflags)',
-          '<@(supercluster_cflags)',
-          '<@(kdbush_cflags)',
          '<@(rapidjson_cflags)',
          '<@(variant_cflags)',
          '<@(earcut_cflags)',
--- a/platform/android/scripts/configure.sh
+++ b/platform/android/scripts/configure.sh
@@ -12,8 +12,6 @@ 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
--- a/platform/ios/scripts/configure.sh
+++ b/platform/ios/scripts/configure.sh
@@ -8,8 +8,6 @@ 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
--- a/platform/linux/scripts/configure.sh
+++ b/platform/linux/scripts/configure.sh
@@ -17,8 +17,6 @@ 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:-}
--- a/platform/macos/scripts/configure.sh
+++ b/platform/macos/scripts/configure.sh
@@ -11,8 +11,6 @@ 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
--- a/platform/qt/scripts/configure.sh
+++ b/platform/qt/scripts/configure.sh
@@ -8,8 +8,6 @@ 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
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -103,8 +103,6 @@
          '<@(boost_cflags)',
          '<@(sqlite_cflags)',
          '<@(geojsonvt_cflags)',
-          '<@(supercluster_cflags)',
-          '<@(kdbush_cflags)',
          '<@(rapidjson_cflags)',
          '<@(pixelmatch_cflags)',
          '<@(earcut_cflags)',
@@ -115,7 +113,8 @@
        ],
        'libraries': [
          '<@(gtest_static_libs)',
-          '<@(sqlite_static_libs)'
+          '<@(sqlite_static_libs)',
+          '<@(geojsonvt_static_libs)',
        ],
      },