diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-15 17:03:13 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-19 09:40:43 -0700 |
| commit | dc1861f6d5391707126a20dbb0272f5bd3522de8 (patch) | |
| tree | 961a3612706b9466d9ff0ef278ae1206b821aa88 /cmake | |
| parent | 940124ff713a960d7f70071779dd37d07010fa80 (diff) | |
| download | qtlocation-mapboxgl-dc1861f6d5391707126a20dbb0272f5bd3522de8.tar.gz | |
[core] Merge GlyphStore and GlyphAtlas
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 8 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 4e1773eaac..fa681a03c4 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -62,8 +62,6 @@ set(MBGL_CORE_FILES src/mbgl/geometry/feature_index.hpp src/mbgl/geometry/fill_buffer.cpp src/mbgl/geometry/fill_buffer.hpp - src/mbgl/geometry/glyph_atlas.cpp - src/mbgl/geometry/glyph_atlas.hpp src/mbgl/geometry/icon_buffer.cpp src/mbgl/geometry/icon_buffer.hpp src/mbgl/geometry/line_atlas.cpp @@ -352,14 +350,14 @@ set(MBGL_CORE_FILES src/mbgl/text/get_anchors.hpp src/mbgl/text/glyph.cpp src/mbgl/text/glyph.hpp + src/mbgl/text/glyph_atlas.cpp + src/mbgl/text/glyph_atlas.hpp + src/mbgl/text/glyph_atlas_observer.hpp src/mbgl/text/glyph_pbf.cpp src/mbgl/text/glyph_pbf.hpp src/mbgl/text/glyph_range.hpp src/mbgl/text/glyph_set.cpp src/mbgl/text/glyph_set.hpp - src/mbgl/text/glyph_store.cpp - src/mbgl/text/glyph_store.hpp - src/mbgl/text/glyph_store_observer.hpp src/mbgl/text/placement_config.hpp src/mbgl/text/quads.cpp src/mbgl/text/quads.hpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 23dc0b82ce..706d1bca59 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -74,7 +74,6 @@ set(MBGL_TEST_FILES # style test/style/filter.cpp test/style/functions.cpp - test/style/glyph_store.cpp test/style/source.cpp test/style/style.cpp test/style/style_layer.cpp @@ -82,6 +81,7 @@ set(MBGL_TEST_FILES test/style/tile_source.cpp # text + test/text/glyph_atlas.cpp test/text/quads.cpp # tile |