diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-05-28 16:24:56 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-06-11 15:16:20 +0200 |
| commit | cdda739facf650dac5267d86b98903c4ba1d02ed (patch) | |
| tree | 1756bff5fc28b2a1567097432a25dee64b2b817e | |
| parent | 70a80c935e780e5f8989b696970d93fad7f38f55 (diff) | |
| download | qtlocation-mapboxgl-cdda739facf650dac5267d86b98903c4ba1d02ed.tar.gz | |
[linux] link EGL backend against SwiftShader to avoid Mesa dependency
| -rw-r--r-- | platform/linux/config.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index dd5f0af112..ff5718ff8a 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(sqlite VERSION 3.14.2) mason_use(libuv VERSION 1.9.1) mason_use(nunicode VERSION 1.7.1) @@ -14,8 +13,6 @@ mason_use(args VERSION 6.2.0 HEADER_ONLY) 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 @@ -27,10 +24,8 @@ macro(mbgl_platform_core) target_sources(mbgl-core PRIVATE platform/linux/src/headless_backend_egl.cpp ) - target_link_libraries(mbgl-core - PUBLIC -lGLESv2 - PUBLIC -lEGL - ) + 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 |