diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-11-17 17:22:43 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2017-11-20 22:40:32 +0100 |
| commit | 2702ed593a3ba9160f8371de3070721db2f8f5de (patch) | |
| tree | 75620aab5f911a941dfe44e0156c6e99b49efe10 | |
| parent | dda87bbecd44a16ddc5b4dcb7e4bbf670376b39f (diff) | |
| download | qtlocation-mapboxgl-2702ed593a3ba9160f8371de3070721db2f8f5de.tar.gz | |
[build] use EGL/GLESv2 headers from SwiftShader rather than requiring Mesa
| -rw-r--r-- | platform/linux/config.cmake | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index edac8e59ac..e60cb62dac 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -1,5 +1,4 @@ mason_use(glfw VERSION 2017-07-13-67c9155) -mason_use(mesa VERSION 13.0.4) mason_use(boost_libprogram_options VERSION 1.62.0${MASON_CXXABI_SUFFIX}) mason_use(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) @@ -14,13 +13,13 @@ mason_use(icu VERSION 58.1-min-size) include(cmake/loop-uv.cmake) macro(mbgl_platform_core) - target_add_mason_package(mbgl-core PUBLIC mesa) - if(WITH_OSMESA) target_sources(mbgl-core PRIVATE platform/default/headless_backend_osmesa.cpp PRIVATE platform/default/mbgl/gl/headless_display.cpp ) + mason_use(mesa VERSION 13.0.4) + target_add_mason_package(mbgl-core PUBLIC mesa) target_link_libraries(mbgl-core PUBLIC -lOSMesa ) @@ -29,11 +28,8 @@ macro(mbgl_platform_core) PRIVATE platform/linux/src/headless_backend_egl.cpp PRIVATE platform/linux/src/headless_display_egl.cpp ) - target_link_libraries(mbgl-core - PUBLIC -lGLESv2 - PUBLIC -lEGL - PUBLIC -lgbm - ) + mason_use(swiftshader VERSION 2017-11-20) + target_add_mason_package(mbgl-core PUBLIC swiftshader) else() target_sources(mbgl-core PRIVATE platform/linux/src/headless_backend_glx.cpp |