summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2019-09-20 13:44:39 +0300
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2019-09-20 15:27:52 +0300
commit3888af2460eb601317ccb755a9cffb9ea92ad45d (patch)
tree8f95596d1bf270e856dfebffe5c9a826673dab08
parent381dda31b478bc768d5b5691619dce47fc9fa20d (diff)
downloadqtlocation-mapboxgl-3888af2460eb601317ccb755a9cffb9ea92ad45d.tar.gz
[build] Move compression to platform
It depends on platform specific compression library.
-rw-r--r--next/CMakeLists.txt1
-rw-r--r--next/platform/android/android.cmake1
-rw-r--r--next/platform/ios/ios.cmake1
-rw-r--r--next/platform/linux/linux.cmake1
-rw-r--r--next/platform/macos/macos.cmake1
-rw-r--r--next/platform/qt/qt.cmake1
-rw-r--r--platform/android/core-files.json1
-rw-r--r--platform/default/src/mbgl/util/compression.cpp (renamed from src/mbgl/util/compression.cpp)0
-rw-r--r--platform/ios/core-files.json1
-rw-r--r--platform/linux/config.cmake1
-rw-r--r--platform/macos/core-files.json1
-rw-r--r--src/core-files.json1
12 files changed, 9 insertions, 2 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt
index e1fd442d48..dae8ce09a1 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 6b6a431ced..70683149d0 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 7be60bd387..507150fc9a 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 8a80da1928..9c8a3830b8 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 747ac5839b..d0aad9c3dc 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 746fd39711..a63b1cd4de 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 b19e5d9a93..362098dd9b 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
index 1742898f9e..1742898f9e 100644
--- a/src/mbgl/util/compression.cpp
+++ b/platform/default/src/mbgl/util/compression.cpp
diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json
index 67edda9733..c4930b1667 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 74860ea0d7..55e6e3c192 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 a17a48c52f..21b0e698f0 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 4867bd3dc4..d881e6259d 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",