diff options
| author | Jesse Bounds <jesse@rebounds.net> | 2016-10-25 15:48:29 -0700 |
|---|---|---|
| committer | Jesse Bounds <jesse@rebounds.net> | 2016-10-25 15:48:29 -0700 |
| commit | dbfa8dcc89ff55fa1f8366433d24b1a270e53a02 (patch) | |
| tree | a68cd34e2197012c2b0ab9525bc747bc7c4c94e7 /platform/ios/config.cmake | |
| parent | 1216050f9c5c472f1c8edcc32447004a40680ec7 (diff) | |
| parent | a4d259c33f9bb890bba97fd89552720e3e0ec09b (diff) | |
| download | qtlocation-mapboxgl-dbfa8dcc89ff55fa1f8366433d24b1a270e53a02.tar.gz | |
Merge branch 'master' into boundsj-release-ios-3.4.0-merge-master
Diffstat (limited to 'platform/ios/config.cmake')
| -rw-r--r-- | platform/ios/config.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 6c83395a3e..0813d0338f 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -37,9 +37,13 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/image.mm # Headless view - PRIVATE platform/darwin/src/headless_view_eagl.mm + PRIVATE platform/darwin/src/headless_backend_eagl.mm + PRIVATE platform/default/headless_backend.cpp PRIVATE platform/default/headless_display.cpp - PRIVATE platform/default/headless_view.cpp + PRIVATE platform/default/offscreen_view.cpp + + # Thread pool + PRIVATE platform/default/thread_pool.cpp ) target_add_mason_package(mbgl-core PUBLIC geojson) @@ -50,7 +54,7 @@ macro(mbgl_platform_core) # TODO: Remove this by converting to ARC set_source_files_properties( - platform/darwin/src/headless_view_eagl.mm + platform/darwin/src/headless_backend_eagl.mm PROPERTIES COMPILE_FLAGS -fno-objc-arc ) |