From aa216d00254c18f7b5903026ab1a489ae7797dd8 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 22 May 2017 13:28:09 -0700 Subject: [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. --- cmake/core-files.cmake | 2 -- cmake/test-files.cmake | 1 - 2 files changed, 3 deletions(-) (limited to 'cmake') 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 -- cgit v1.2.1