diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-15 15:40:35 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-19 09:40:43 -0700 |
| commit | 940124ff713a960d7f70071779dd37d07010fa80 (patch) | |
| tree | a89c129b9e972946ab29f05587381c45649a5d99 /cmake | |
| parent | 1014a503a22dc47e4e6ec3c37d034fd729873345 (diff) | |
| download | qtlocation-mapboxgl-940124ff713a960d7f70071779dd37d07010fa80.tar.gz | |
[core] Merge SpriteStore and SpriteAtlas
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 4 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 11300e444d..4e1773eaac 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -210,12 +210,10 @@ set(MBGL_CORE_FILES include/mbgl/sprite/sprite_image.hpp src/mbgl/sprite/sprite_atlas.cpp src/mbgl/sprite/sprite_atlas.hpp + src/mbgl/sprite/sprite_atlas_observer.hpp src/mbgl/sprite/sprite_image.cpp src/mbgl/sprite/sprite_parser.cpp src/mbgl/sprite/sprite_parser.hpp - src/mbgl/sprite/sprite_store.cpp - src/mbgl/sprite/sprite_store.hpp - src/mbgl/sprite/sprite_store_observer.hpp # storage include/mbgl/storage/default_file_source.hpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 84f9bcca63..23dc0b82ce 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -40,7 +40,6 @@ set(MBGL_TEST_FILES test/sprite/sprite_atlas.cpp test/sprite/sprite_image.cpp test/sprite/sprite_parser.cpp - test/sprite/sprite_store.cpp # src test/src/main.cpp @@ -81,7 +80,6 @@ set(MBGL_TEST_FILES test/style/style_layer.cpp test/style/style_parser.cpp test/style/tile_source.cpp - test/style/variant.cpp # text test/text/quads.cpp |