diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-23 17:22:38 +0300 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-09-26 10:55:47 +0300 |
| commit | e5cdc4ecf362dadf2da148a22cf97aaf3c9c4ecf (patch) | |
| tree | ebae02fa6a6da0f4c81cb72df87c6d7359c17acd /next | |
| parent | 9c8295c6a64b6f5b2c9b67fd01633a156481a3c8 (diff) | |
| download | qtlocation-mapboxgl-e5cdc4ecf362dadf2da148a22cf97aaf3c9c4ecf.tar.gz | |
[core][android][darwin] Move number format to i18n
Diffstat (limited to 'next')
| -rw-r--r-- | next/platform/android/android.cmake | 8 | ||||
| -rw-r--r-- | next/platform/ios/ios.cmake | 1 | ||||
| -rw-r--r-- | next/platform/linux/linux.cmake | 4 | ||||
| -rw-r--r-- | next/platform/macos/macos.cmake | 1 | ||||
| -rw-r--r-- | next/platform/qt/qt.cmake | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/next/platform/android/android.cmake b/next/platform/android/android.cmake index edc74576dc..507c1baef0 100644 --- a/next/platform/android/android.cmake +++ b/next/platform/android/android.cmake @@ -85,6 +85,10 @@ target_sources( ${MBGL_ROOT}/platform/android/src/gson/json_primitive.cpp ${MBGL_ROOT}/platform/android/src/gson/json_primitive.hpp ${MBGL_ROOT}/platform/android/src/http_file_source.cpp + ${MBGL_ROOT}/platform/android/src/i18n/collator.cpp + ${MBGL_ROOT}/platform/android/src/i18n/collator_jni.hpp + ${MBGL_ROOT}/platform/android/src/i18n/number_format.cpp + ${MBGL_ROOT}/platform/android/src/i18n/number_format_jni.hpp ${MBGL_ROOT}/platform/android/src/image.cpp ${MBGL_ROOT}/platform/android/src/java/util.cpp ${MBGL_ROOT}/platform/android/src/java/util.hpp @@ -187,10 +191,6 @@ target_sources( ${MBGL_ROOT}/platform/android/src/style/transition_options.hpp ${MBGL_ROOT}/platform/android/src/style/value.cpp ${MBGL_ROOT}/platform/android/src/style/value.hpp - ${MBGL_ROOT}/platform/android/src/i18n/collator.cpp - ${MBGL_ROOT}/platform/android/src/i18n/collator_jni.hpp - ${MBGL_ROOT}/platform/android/src/text/format_number.cpp - ${MBGL_ROOT}/platform/android/src/text/format_number_jni.hpp ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer.cpp ${MBGL_ROOT}/platform/android/src/text/local_glyph_rasterizer_jni.hpp ${MBGL_ROOT}/platform/android/src/thread.cpp diff --git a/next/platform/ios/ios.cmake b/next/platform/ios/ios.cmake index 507150fc9a..7a729d996a 100644 --- a/next/platform/ios/ios.cmake +++ b/next/platform/ios/ios.cmake @@ -15,6 +15,7 @@ target_sources( ${MBGL_ROOT}/platform/darwin/src/local_glyph_rasterizer.mm ${MBGL_ROOT}/platform/darwin/src/logging_nslog.mm ${MBGL_ROOT}/platform/darwin/src/nsthread.mm + ${MBGL_ROOT}/platform/darwin/src/number_format.mm ${MBGL_ROOT}/platform/darwin/src/reachability.m ${MBGL_ROOT}/platform/darwin/src/run_loop.cpp ${MBGL_ROOT}/platform/darwin/src/string_nsstring.mm diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake index 993d3512e3..18531a2856 100644 --- a/next/platform/linux/linux.cmake +++ b/next/platform/linux/linux.cmake @@ -15,6 +15,8 @@ target_sources( ${MBGL_ROOT}/platform/default/src/mbgl/gfx/headless_backend.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gfx/headless_frontend.cpp ${MBGL_ROOT}/platform/default/src/mbgl/gl/headless_backend.cpp + ${MBGL_ROOT}/platform/default/src/mbgl/i18n/collator.cpp + ${MBGL_ROOT}/platform/default/src/mbgl/i18n/number_format.cpp ${MBGL_ROOT}/platform/default/src/mbgl/layermanager/layer_manager.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/asset_file_source.cpp ${MBGL_ROOT}/platform/default/src/mbgl/storage/default_file_source.cpp @@ -29,11 +31,9 @@ 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/i18n/collator.cpp ${MBGL_ROOT}/platform/default/src/mbgl/text/local_glyph_rasterizer.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 ${MBGL_ROOT}/platform/default/src/mbgl/util/logging_stderr.cpp diff --git a/next/platform/macos/macos.cmake b/next/platform/macos/macos.cmake index d0aad9c3dc..a0dcb9a829 100644 --- a/next/platform/macos/macos.cmake +++ b/next/platform/macos/macos.cmake @@ -83,6 +83,7 @@ target_sources( ${MBGL_ROOT}/platform/darwin/src/local_glyph_rasterizer.mm ${MBGL_ROOT}/platform/darwin/src/logging_nslog.mm ${MBGL_ROOT}/platform/darwin/src/nsthread.mm + ${MBGL_ROOT}/platform/darwin/src/number_format.mm ${MBGL_ROOT}/platform/darwin/src/reachability.m ${MBGL_ROOT}/platform/darwin/src/run_loop.cpp ${MBGL_ROOT}/platform/darwin/src/string_nsstring.mm diff --git a/next/platform/qt/qt.cmake b/next/platform/qt/qt.cmake index 59aa00788f..b902388565 100644 --- a/next/platform/qt/qt.cmake +++ b/next/platform/qt/qt.cmake @@ -45,7 +45,7 @@ target_sources( ${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 + ${MBGL_ROOT}/platform/qt/src/number_format.cpp ${MBGL_ROOT}/platform/qt/src/gl_functions.cpp ${MBGL_ROOT}/platform/qt/src/headless_backend_qt.cpp ${MBGL_ROOT}/platform/qt/src/http_file_source.cpp |