diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-01-24 15:47:53 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-01-27 18:45:16 +0100 |
| commit | 4d358260140c9d52103cc95631a8519b969bc408 (patch) | |
| tree | daf17b610189a824eab34e4055b9bc0ebf585375 /platform/android/config.cmake | |
| parent | 14d5c336d72f3af54e3f72295e901591e219b5a9 (diff) | |
| download | qtlocation-mapboxgl-4d358260140c9d52103cc95631a8519b969bc408.tar.gz | |
[android] use native image encoding and decoding
Diffstat (limited to 'platform/android/config.cmake')
| -rw-r--r-- | platform/android/config.cmake | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 326ddb612a..7d554dc786 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -19,8 +19,6 @@ if ((ANDROID_ABI STREQUAL "armeabi") OR (ANDROID_ABI STREQUAL "armeabi-v7a") OR endif() mason_use(jni.hpp VERSION 2.0.0 HEADER_ONLY) -mason_use(libjpeg-turbo VERSION 1.5.0) -mason_use(libpng VERSION 1.6.25) mason_use(libzip VERSION 1.1.3) mason_use(nunicode VERSION 1.7.1) mason_use(sqlite VERSION 3.14.2) @@ -68,10 +66,12 @@ macro(mbgl_platform_core) PRIVATE platform/default/utf.cpp # Image handling - PRIVATE platform/default/image.cpp PRIVATE platform/default/png_writer.cpp - PRIVATE platform/default/png_reader.cpp - PRIVATE platform/default/jpeg_reader.cpp + PRIVATE platform/android/src/bitmap.cpp + PRIVATE platform/android/src/bitmap.hpp + PRIVATE platform/android/src/bitmap_factory.cpp + PRIVATE platform/android/src/bitmap_factory.hpp + PRIVATE platform/android/src/image.cpp # Thread pool PRIVATE platform/default/mbgl/util/default_thread_pool.cpp @@ -147,8 +147,6 @@ macro(mbgl_platform_core) target_add_mason_package(mbgl-core PUBLIC sqlite) 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 libzip) target_add_mason_package(mbgl-core PUBLIC geojson) target_add_mason_package(mbgl-core PUBLIC jni.hpp) @@ -165,6 +163,7 @@ macro(mbgl_platform_core) target_link_libraries(mbgl-core PUBLIC -llog PUBLIC -landroid + PUBLIC -ljnigraphics PUBLIC -lEGL PUBLIC -lGLESv2 PUBLIC -lstdc++ |