diff options
| -rw-r--r-- | src/meson.build | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/meson.build b/src/meson.build index d86c0ec21a6..69ad05ea03b 100644 --- a/src/meson.build +++ b/src/meson.build @@ -106,22 +106,12 @@ endif # This must be after at least mesa, glx, and gallium, since libgl will be # defined in one of those subdirs depending on the glx provider. -if with_glx != 'disabled' - # If using glvnd the pkg-config header should not point to GL_mesa, it should - # point to GL. glvnd is only available on unix like platforms so adding -l - # should be safe here - # TODO: in the glvnd case glvnd itself should really be providing this. - if with_glvnd - _gl = '-L${libdir} -lGL' - else - _gl = libgl - endif - +if with_glx != 'disabled' and not with_glvnd pkg.generate( name : 'gl', description : 'Mesa OpenGL Library', version : meson.project_version(), - libraries : _gl, + libraries : libgl, libraries_private : gl_priv_libs, requires_private : gl_priv_reqs, variables : ['glx_tls=yes'], |