From 3888af2460eb601317ccb755a9cffb9ea92ad45d Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 20 Sep 2019 13:44:39 +0300 Subject: [PATCH] [build] Move compression to platform It depends on platform specific compression library. --- next/CMakeLists.txt | 1 - next/platform/android/android.cmake | 1 + next/platform/ios/ios.cmake | 1 + next/platform/linux/linux.cmake | 1 + next/platform/macos/macos.cmake | 1 + next/platform/qt/qt.cmake | 1 + platform/android/core-files.json | 1 + {src => platform/default/src}/mbgl/util/compression.cpp | 0 platform/ios/core-files.json | 1 + platform/linux/config.cmake | 1 + platform/macos/core-files.json | 1 + src/core-files.json | 1 - 12 files changed, 9 insertions(+), 2 deletions(-) rename {src => platform/default/src}/mbgl/util/compression.cpp (100%) diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index e1fd442d4..dae8ce09a 100644 --- 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 diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index 6b6a431ce..70683149d 100644 --- 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 diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake index 7be60bd38..507150fc9 100644 --- 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 diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake index 8a80da192..9c8a3830b 100644 --- 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 diff --git a/next/platform/macos/macos.cmake b/next/platform/macos/macos.cmake index 747ac5839..d0aad9c3d 100644 --- 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 diff --git a/next/platform/qt/qt.cmake b/next/platform/qt/qt.cmake index 746fd3971..a63b1cd4d 100644 --- 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 diff --git a/platform/android/core-files.json b/platform/android/core-files.json index b19e5d9a9..362098dd9 100644 --- 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", diff --git a/src/mbgl/util/compression.cpp b/platform/default/src/mbgl/util/compression.cpp similarity index 100% rename from src/mbgl/util/compression.cpp rename to platform/default/src/mbgl/util/compression.cpp diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json index 67edda973..c4930b166 100644 --- 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" diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 74860ea0d..55e6e3c19 100644 --- 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 diff --git a/platform/macos/core-files.json b/platform/macos/core-files.json index a17a48c52..21b0e698f 100644 --- 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" diff --git a/src/core-files.json b/src/core-files.json index 4867bd3dc..d881e6259 100644 --- 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",