diff options
| -rw-r--r-- | src/egl/meson.build | 12 | ||||
| -rw-r--r-- | src/meson.build | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build index 6cd04567b0d..ac8e5d0ae77 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -172,11 +172,21 @@ libegl = shared_library( version : egl_lib_version, ) +# If using glvnd the pkg-config header should not point to EGL_mesa, it should +# point to EGL. 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 + _egl = '-L${libdir} -lEGL' +else + _egl = libegl +endif + pkg.generate( name : 'egl', description : 'Mesa EGL Library', version : meson.project_version(), - libraries : libegl, + libraries : _egl, libraries_private: gl_priv_libs, requires_private : gl_priv_reqs, extra_cflags : gl_pkgconfig_c_flags, diff --git a/src/meson.build b/src/meson.build index 730b2ff6e41..0bf7ebc8b80 100644 --- a/src/meson.build +++ b/src/meson.build @@ -77,6 +77,15 @@ if with_gallium subdir('gallium') endif +# 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 # 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' @@ -84,7 +93,7 @@ if with_glx != 'disabled' name : 'gl', description : 'Mesa OpenGL Library', version : meson.project_version(), - libraries : libgl, + libraries : _gl, libraries_private : gl_priv_libs, requires_private : gl_priv_reqs, variables : ['glx_tls=yes'], |