meson: expose glapi through osmesa

Suggested-by: Pierre Guillou <pierre.guillou@lip6.fr>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109659
Fixes: f121a669c7 "meson: build gallium based osmesa"
Fixes: cbbd5bb889 "meson: build classic osmesa"
Cc: Brian Paul <brianp@vmware.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Tested-by: Chuck Atkins <chuck.atkins@kitware.com>
(cherry picked from commit ccb8ea7acf)
This commit is contained in:
Eric Engestrom 2019-05-02 12:42:48 +01:00 committed by Juan A. Suarez Romero
parent 2040f10cb0
commit 6bac1a041d
2 changed files with 4 additions and 3 deletions

View file

@ -43,9 +43,9 @@ libosmesa = shared_library(
inc_gallium_drivers,
],
link_depends : osmesa_link_deps,
link_whole : [libosmesa_st],
link_whole : [libosmesa_st, libglapi_static],
link_with : [
libmesa_gallium, libgallium, libglapi_static, libws_null, osmesa_link_with,
libmesa_gallium, libgallium, libws_null, osmesa_link_with,
],
dependencies : [
dep_selinux, dep_thread, dep_clock, dep_unwind,

View file

@ -33,7 +33,8 @@ libosmesa = shared_library(
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux,
],
link_with : [libmesa_classic, libglapi_static, osmesa_link_with],
link_whole : libglapi_static,
link_with : [libmesa_classic, osmesa_link_with],
dependencies : [dep_thread, dep_selinux],
version : '8.0.0',
install : true,