From 451381a61ad0c96e870da2325fc188eaa3d91fec Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 22 Apr 2020 14:08:36 -0500 Subject: [PATCH 2/2] meson: Separate surfaceless option from x11 Allow surfaceless build separate from the x11 option. Also require gbm for surfaceless build. Upstream-Status: Pending Signed-off-by: Tom Hochstein --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4ebb022..0705f61 100644 --- a/meson.build +++ b/meson.build @@ -72,6 +72,7 @@ dep_udev = _dep_null dep_cocoa = _dep_null dep_core_foundation = _dep_null dep_gl_headers = _dep_null +dep_surfaceless = _dep_null # Get dependencies if build_wgl @@ -101,12 +102,14 @@ else endif dep_gbm = dependency('gbm', required : get_option('gbm')) dep_udev = dependency('libudev', required : get_option('gbm')) + dep_surfaceless_egl = dependency('egl', required : get_option('surfaceless_egl')) + dep_surfaceless_gbm = dependency('gbm', required : get_option('surfaceless_egl')) build_x11_egl = dep_egl.found() build_wayland = dep_wayland_client.found() and dep_wayland_egl.found() and dep_wayland_wayland_egl.found() build_glx = dep_gl.found() build_gbm = dep_gbm.found() and dep_udev.found() - build_surfaceless = dep_egl.found() + build_surfaceless = dep_surfaceless_egl.found() and dep_surfaceless_gbm.found() endif dep_bash = dependency('bash-completion', required : false) -- 2.17.1