diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-22 13:28:09 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-26 11:21:56 -0700 |
| commit | aa216d00254c18f7b5903026ab1a489ae7797dd8 (patch) | |
| tree | 7decb42cb0f8a8a5ae0e9d3bdcfdf69e76949e15 /cmake | |
| parent | 6cf9d5cfbfe8120121d8d53cbbf8915cea8f4879 (diff) | |
| download | qtlocation-mapboxgl-aa216d00254c18f7b5903026ab1a489ae7797dd8.tar.gz | |
[core] Don't use a separate SpriteAtlas for annotation images
Instead, just add them to the Style as needed. Includes changes from #8905 and takes care to avoid regressing #3817.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 2 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index dfe11b82b8..e56f2fdc37 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -288,8 +288,6 @@ set(MBGL_CORE_FILES # sprite src/mbgl/sprite/sprite_atlas.cpp src/mbgl/sprite/sprite_atlas.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 diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 83b935d63f..c0673bedef 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -46,7 +46,6 @@ 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 |