From ce8cbdbe064f5fd7f3e78b6349fa86604e6189d7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 23 Feb 2018 15:44:50 +0000 Subject: Allow building Epoxy without X11 Epoxy can be compiled with GLX and X11 native resources on EGL. We can disable the former, but the latter is always built in when enabling EGL support. Some platforms do not support X11 at all, so we need a way to disable X11 when configuring Epoxy. --- test/meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/meson.build b/test/meson.build index 2340fc6..a72d02f 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,6 +1,6 @@ has_gles1 = gles1_dep.found() has_gles2 = gles2_dep.found() -build_x11_tests = build_glx and x11_dep.found() +build_x11_tests = enable_x11 and x11_dep.found() test_cflags = common_cflags + [ '-D_XOPEN_SOURCE', @@ -39,11 +39,16 @@ if build_egl and build_x11_tests egl_tests = [ [ 'egl_has_extension_nocontext', [], [ 'egl_has_extension_nocontext.c' ], true, ], - [ 'egl_gl', [], [ 'egl_gl.c' ], true, ], [ 'egl_gles1_without_glx', [ '-DGLES_VERSION=1', ], [ 'egl_without_glx.c' ], has_gles1, ], [ 'egl_gles2_without_glx', [ '-DGLES_VERSION=2', ], [ 'egl_without_glx.c' ], has_gles2, ], ] + if build_glx + egl_tests += [ + [ 'egl_gl', [], [ 'egl_gl.c' ], true, ], + ] + endif + foreach test: egl_tests test_name = test[0] test_source = test[2] -- cgit v1.2.1