diff options
| author | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-05-12 23:19:00 +0300 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-12 13:19:00 -0700 |
| commit | cc9f040a2d35293c51dcc5be9c7affea7f1263bd (patch) | |
| tree | de62a5610e719f5bfe07226c3382d4d2a5e17530 /cmake | |
| parent | c80f3e9d29d1c26ccc88ef30f8f17329c9bfb1b7 (diff) | |
| download | qtlocation-mapboxgl-cc9f040a2d35293c51dcc5be9c7affea7f1263bd.tar.gz | |
[core] Split style image collection from SpriteAtlas
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 13 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index f83a0413b9..fbe43bef3b 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -283,9 +283,13 @@ set(MBGL_CORE_FILES # sprite src/mbgl/sprite/sprite_atlas.cpp src/mbgl/sprite/sprite_atlas.hpp - src/mbgl/sprite/sprite_atlas_observer.hpp - src/mbgl/sprite/sprite_atlas_worker.cpp - src/mbgl/sprite/sprite_atlas_worker.hpp + src/mbgl/sprite/sprite_image_collection.cpp + src/mbgl/sprite/sprite_image_collection.hpp + src/mbgl/sprite/sprite_loader.cpp + src/mbgl/sprite/sprite_loader.hpp + src/mbgl/sprite/sprite_loader_observer.hpp + src/mbgl/sprite/sprite_loader_worker.cpp + src/mbgl/sprite/sprite_loader_worker.hpp src/mbgl/sprite/sprite_parser.cpp src/mbgl/sprite/sprite_parser.hpp @@ -322,6 +326,8 @@ set(MBGL_CORE_FILES src/mbgl/style/class_dictionary.cpp src/mbgl/style/class_dictionary.hpp src/mbgl/style/image.cpp + src/mbgl/style/image_impl.cpp + src/mbgl/style/image_impl.hpp src/mbgl/style/layer.cpp src/mbgl/style/layer_impl.cpp src/mbgl/style/layer_impl.hpp @@ -363,6 +369,7 @@ set(MBGL_CORE_FILES include/mbgl/style/conversion/tileset.hpp include/mbgl/style/conversion/transition_options.hpp src/mbgl/style/conversion/geojson.cpp + src/mbgl/style/conversion/json.hpp src/mbgl/style/conversion/stringify.hpp # style/function diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 6026374de6..5eb9d8d9f8 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -46,6 +46,8 @@ set(MBGL_TEST_FILES # sprite test/sprite/sprite_atlas.test.cpp + test/sprite/sprite_image_collection.test.cpp + test/sprite/sprite_loader.test.cpp test/sprite/sprite_parser.test.cpp # src/mbgl/test |