Add WebP decoding support to Linux and Windows (#1314)

This commit is contained in:
mwilsnd
2023-07-09 08:57:42 -05:00
committed by GitHub
parent 412c3c1cce
commit 97c75856ad
14 changed files with 70 additions and 7 deletions

View File

@@ -23,6 +23,7 @@ cc_library(
"-lcurl",
"-lpng",
"-ljpeg",
"-lwebp",
] + ICU_FLAGS,
visibility = ["//visibility:public"],
deps = [

View File

@@ -7,7 +7,7 @@ This guide explains how to get started building and running MapLibre Native on L
The following system libraries need to be installed.
```bash
apt install libcurl4-openssl-dev libglfw3-dev libuv1-dev libpng-dev libicu-dev libjpeg62-turbo
apt install libcurl4-openssl-dev libglfw3-dev libuv1-dev libpng-dev libicu-dev libjpeg62-turbo libwebp-dev
```
Optional: `libsqlite3-dev` (also available as vendored dependency).

View File

@@ -12,6 +12,7 @@ if (MLN_WITH_X11)
endif ()
find_package(Threads REQUIRED)
pkg_search_module(WEBP libwebp REQUIRED)
pkg_search_module(LIBUV libuv REQUIRED)
target_sources(
@@ -45,6 +46,7 @@ target_sources(
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/filesystem.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/image.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/jpeg_reader.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/webp_reader.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/logging_stderr.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/monotonic_timer.cpp
${PROJECT_SOURCE_DIR}/platform/default/src/mbgl/util/png_reader.cpp
@@ -100,6 +102,7 @@ target_include_directories(
${JPEG_INCLUDE_DIRS}
${LIBUV_INCLUDE_DIRS}
${X11_INCLUDE_DIRS}
${WEBP_INCLUDE_DIRS}
)
include(${PROJECT_SOURCE_DIR}/vendor/nunicode.cmake)
@@ -127,6 +130,7 @@ target_link_libraries(
${LIBUV_LIBRARIES}
${X11_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${WEBP_LIBRARIES}
$<$<NOT:$<BOOL:${MLN_USE_BUILTIN_ICU}>>:ICU::i18n>
$<$<NOT:$<BOOL:${MLN_USE_BUILTIN_ICU}>>:ICU::uc>
$<$<BOOL:${MLN_USE_BUILTIN_ICU}>:mbgl-vendor-icu>