diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-01-29 10:50:18 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-01-29 10:50:18 +0000 |
| commit | 358039c440613e22658658d213918cffcaa6fbc1 (patch) | |
| tree | afcd6291a2961b26297dd1c25bb09358db1a51c0 /lib/mesa/src | |
| parent | 05a3e38e57bf4fee32b96f4cd3c032e6fb7fba04 (diff) | |
Import Mesa 18.3.2
Diffstat (limited to 'lib/mesa/src')
| -rw-r--r-- | lib/mesa/src/mesa/drivers/dri/swrast/meson.build | 3 | ||||
| -rw-r--r-- | lib/mesa/src/mesa/drivers/osmesa/meson.build | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/mesa/src/mesa/drivers/dri/swrast/meson.build b/lib/mesa/src/mesa/drivers/dri/swrast/meson.build index 35b30588c..5ceb1e33e 100644 --- a/lib/mesa/src/mesa/drivers/dri/swrast/meson.build +++ b/lib/mesa/src/mesa/drivers/dri/swrast/meson.build @@ -25,3 +25,6 @@ libswrast_dri = static_library( include_directories : [inc_common, inc_dri_common], dependencies : dep_libdrm, ) + +dri_drivers += libswrast_dri +dri_link += 'swrast_dri.so' diff --git a/lib/mesa/src/mesa/drivers/osmesa/meson.build b/lib/mesa/src/mesa/drivers/osmesa/meson.build index f9ba2c5ad..a406bb3c2 100644 --- a/lib/mesa/src/mesa/drivers/osmesa/meson.build +++ b/lib/mesa/src/mesa/drivers/osmesa/meson.build @@ -33,11 +33,8 @@ libosmesa = shared_library( include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, ], - link_whole : libglapi_static, - link_with : [libmesa_classic, osmesa_link_with], + link_with : [libmesa_classic, libglapi_static, osmesa_link_with], dependencies : [dep_thread, dep_selinux], - name_prefix : host_machine.system() == 'windows' ? '' : 'lib', # otherwise mingw will create libosmesa.dll - soversion : host_machine.system() == 'windows' ? '' : '8', version : '8.0.0', install : true, ) |