diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/config.cmake | 4 | ||||
| -rw-r--r-- | platform/default/string_stdlib.cpp | 5 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 5 | ||||
| -rw-r--r-- | platform/qt/config.cmake | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index c25e48de05..bb4fa3bfb6 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -1,5 +1,6 @@ add_definitions(-DMBGL_USE_GLES2=1) include(cmake/test-files.cmake) +include(cmake/nunicode.cmake) # Build thin archives. set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>") @@ -21,7 +22,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections -Wl,--ve set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--version-script=${CMAKE_SOURCE_DIR}/platform/android/version-script") mason_use(jni.hpp VERSION 3.0.0 HEADER_ONLY) -mason_use(nunicode VERSION 1.7.1) mason_use(sqlite VERSION 3.14.2) mason_use(gtest VERSION 1.8.0) mason_use(icu VERSION 58.1-min-size) @@ -81,13 +81,13 @@ macro(mbgl_platform_core) PRIVATE platform/android ) - target_add_mason_package(mbgl-core PUBLIC nunicode) target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC jni.hpp) target_add_mason_package(mbgl-core PUBLIC rapidjson) target_add_mason_package(mbgl-core PRIVATE icu) target_link_libraries(mbgl-core + PRIVATE nunicode PUBLIC -llog PUBLIC -landroid PUBLIC -ljnigraphics diff --git a/platform/default/string_stdlib.cpp b/platform/default/string_stdlib.cpp index 2642e88aff..103444df1c 100644 --- a/platform/default/string_stdlib.cpp +++ b/platform/default/string_stdlib.cpp @@ -1,8 +1,5 @@ #include <mbgl/util/platform.hpp> -#define NU_WITH_TOUPPER -#define NU_WITH_TOLOWER -#define NU_WITH_UTF8_WRITER -#include <libnu/libnu.h> +#include <libnu/casemap.h> #include <cstring> #include <sstream> diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 1a8fbff7b2..fe4cd5fcc3 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,7 +1,8 @@ +include(cmake/nunicode.cmake) + mason_use(glfw VERSION 2018-06-27-0be4f3f) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) -mason_use(nunicode VERSION 1.7.1) mason_use(libpng VERSION 1.6.25) mason_use(libjpeg-turbo VERSION 1.5.0) mason_use(webp VERSION 0.5.1) @@ -85,13 +86,13 @@ macro(mbgl_platform_core) PRIVATE platform/linux ) - target_add_mason_package(mbgl-core PUBLIC nunicode) target_add_mason_package(mbgl-core PUBLIC libpng) target_add_mason_package(mbgl-core PUBLIC libjpeg-turbo) target_add_mason_package(mbgl-core PUBLIC webp) target_add_mason_package(mbgl-core PRIVATE icu) target_link_libraries(mbgl-core + PRIVATE nunicode PUBLIC -lz ) diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 5f04367b25..fdbc463601 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -2,6 +2,7 @@ mason_use(optional VERSION f27e7908 HEADER_ONLY) mason_use(tao_tuple VERSION 28626e99 HEADER_ONLY) include(platform/qt/qt.cmake) +include(cmake/nunicode.cmake) if(NOT WITH_QT_DECODERS) mason_use(libjpeg-turbo VERSION 1.5.0) @@ -26,6 +27,7 @@ macro(mbgl_platform_core) target_link_libraries(mbgl-core ${MBGL_QT_CORE_LIBRARIES} + PRIVATE nunicode ) if(NOT WITH_QT_DECODERS) |