[build] Move compression to platform

It depends on platform specific compression library.
2019-09-20 13:44:39 +03:00
parent 381dda31b4
commit 3888af2460
12 changed files with 9 additions and 2 deletions
--- a/next/CMakeLists.txt
+++ b/next/CMakeLists.txt
@@ -777,7 +777,6 @@ add_library(
    ${MBGL_ROOT}/src/mbgl/tile/vector_tile_data.hpp
    ${MBGL_ROOT}/src/mbgl/util/chrono.cpp
    ${MBGL_ROOT}/src/mbgl/util/color.cpp
-    ${MBGL_ROOT}/src/mbgl/util/compression.cpp
    ${MBGL_ROOT}/src/mbgl/util/constants.cpp
    ${MBGL_ROOT}/src/mbgl/util/convert.cpp
    ${MBGL_ROOT}/src/mbgl/util/dtoa.cpp
--- a/next/platform/android/android.cmake
+++ b/next/platform/android/android.cmake
@@ -211,6 +211,7 @@ target_sources(
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/online_file_source.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/text/bidi.cpp
+        ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/png_writer.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/thread_local.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/utf.cpp
--- a/next/platform/ios/ios.cmake
+++ b/next/platform/ios/ios.cmake
@@ -35,6 +35,7 @@ target_sources(
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/online_file_source.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/text/bidi.cpp
+        ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/png_writer.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/thread_local.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/utf.cpp
--- a/next/platform/linux/linux.cmake
+++ b/next/platform/linux/linux.cmake
@@ -33,6 +33,7 @@ target_sources(
        ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/text/unaccent.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/async_task.cpp
+        ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/format_number.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/image.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/jpeg_reader.cpp
--- a/next/platform/macos/macos.cmake
+++ b/next/platform/macos/macos.cmake
@@ -103,6 +103,7 @@ target_sources(
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/online_file_source.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/text/bidi.cpp
+        ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/png_writer.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/thread_local.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/util/utf.cpp
--- a/next/platform/qt/qt.cmake
+++ b/next/platform/qt/qt.cmake
@@ -44,6 +44,7 @@ target_sources(
        ${MBGL_ROOT}/platform/default/src/mbgl/storage/sqlite3.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/text/collator.cpp
        ${MBGL_ROOT}/platform/default/src/mbgl/text/unaccent.cpp
+        ${MBGL_ROOT}/platform/default/src/mbgl/util/compression.cpp
        ${MBGL_ROOT}/platform/qt/src/async_task.cpp
        ${MBGL_ROOT}/platform/qt/src/async_task_impl.hpp
        ${MBGL_ROOT}/platform/qt/src/format_number.cpp
--- a/platform/android/core-files.json
+++ b/platform/android/core-files.json
@@ -92,6 +92,7 @@
        "platform/default/src/mbgl/gl/headless_backend.cpp",
        "platform/default/src/mbgl/map/map_snapshotter.cpp",
        "platform/default/src/mbgl/text/bidi.cpp",
+        "platform/default/src/mbgl/util/compression.cpp",
        "platform/default/src/mbgl/util/png_writer.cpp",
        "platform/default/src/mbgl/util/thread_local.cpp",
        "platform/default/src/mbgl/util/utf.cpp",
--- a/platform/default/src/mbgl/util/compression.cpp
+++ b/platform/default/src/mbgl/util/compression.cpp
--- a/platform/ios/core-files.json
+++ b/platform/ios/core-files.json
@@ -15,6 +15,7 @@
        "platform/default/src/mbgl/gl/headless_backend.cpp",
        "platform/default/src/mbgl/map/map_snapshotter.cpp",
        "platform/default/src/mbgl/text/bidi.cpp",
+        "platform/default/src/mbgl/util/compression.cpp",
        "platform/default/src/mbgl/util/png_writer.cpp",
        "platform/default/src/mbgl/util/thread_local.cpp",
        "platform/default/src/mbgl/util/utf.cpp"
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -45,6 +45,7 @@ macro(mbgl_platform_core)
        PRIVATE platform/linux/src/gl_functions.cpp

        # Misc
+        PRIVATE platform/default/src/mbgl/util/compression.cpp
        PRIVATE platform/default/src/mbgl/util/logging_stderr.cpp
        PRIVATE platform/default/src/mbgl/util/string_stdlib.cpp
        PRIVATE platform/default/src/mbgl/util/thread.cpp
--- a/platform/macos/core-files.json
+++ b/platform/macos/core-files.json
@@ -14,6 +14,7 @@
        "platform/default/src/mbgl/gl/headless_backend.cpp",
        "platform/default/src/mbgl/map/map_snapshotter.cpp",
        "platform/default/src/mbgl/text/bidi.cpp",
+        "platform/default/src/mbgl/util/compression.cpp",
        "platform/default/src/mbgl/util/png_writer.cpp",
        "platform/default/src/mbgl/util/thread_local.cpp",
        "platform/default/src/mbgl/util/utf.cpp"
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -284,7 +284,6 @@
        "src/mbgl/tile/vector_tile_data.cpp",
        "src/mbgl/util/chrono.cpp",
        "src/mbgl/util/color.cpp",
-        "src/mbgl/util/compression.cpp",
        "src/mbgl/util/constants.cpp",
        "src/mbgl/util/convert.cpp",
        "src/mbgl/util/dtoa.cpp",