summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-06-11 15:27:29 +0200
committerKonstantin Käfer <mail@kkaefer.com>2018-06-11 15:27:29 +0200
commit8e47cccac3649d2f531d60cbc93753ca3bc8dc76 (patch)
tree998f5b672c383cce9009be6d86f02c803324a178
parent3f767d3285fd13a36420ab3d84bf405e6844764d (diff)
downloadqtlocation-mapboxgl-8e47cccac3649d2f531d60cbc93753ca3bc8dc76.tar.gz
fixup macos
m---------platform/ios/vendor/mapbox-events-ios0
-rw-r--r--platform/macos/config.cmake4
2 files changed, 1 insertions, 3 deletions
diff --git a/platform/ios/vendor/mapbox-events-ios b/platform/ios/vendor/mapbox-events-ios
-Subproject ac14fe78043eb823f14c7eefacda29aad0642c9
+Subproject 2570417b77d9b9c22a40930cdf1fad4b985aff0
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 16a9943d7b..da19eae713 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -48,14 +48,12 @@ macro(mbgl_platform_core)
if(WITH_EGL)
target_sources(mbgl-core
PRIVATE platform/linux/src/headless_backend_egl.cpp
- PRIVATE platform/linux/src/headless_display_egl.cpp
)
- mason_use(swiftshader VERSION 2017-11-20)
+ mason_use(swiftshader VERSION 2018-05-31)
target_add_mason_package(mbgl-core PUBLIC swiftshader)
else()
target_sources(mbgl-core
PRIVATE platform/darwin/src/headless_backend_cgl.cpp
- PRIVATE platform/darwin/src/headless_display_cgl.cpp
)
target_link_libraries(mbgl-core
PUBLIC "-framework OpenGL"