AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/meson: move glvnd config file after libEGL

Browse Source 
Necessary for the next commit.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35652>
This commit is contained in:
Eric Engestrom
2024-04-06 20:03:22 +01:00
committed by Marge Bot
parent 2e8d14406f
commit b952c1a26a
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/egl/meson.build
View File

@@ -163,14 +163,6 @@ else
deps_for_egl += dep_glvnd
files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c]
files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c')
configure_file(
configuration: {'glvnd_vendor_name' : glvnd_vendor_name},
input : 'main/50_mesa.json',
output: '50_@0@.json'.format(glvnd_vendor_name),
install : true,
install_tag : 'runtime',
install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d')
)
endif
if with_ld_version_script
@@ -215,7 +207,16 @@ libegl = shared_library(
vs_module_defs : egl_def
)
if not with_glvnd
if with_glvnd
configure_file(
configuration: {'glvnd_vendor_name' : glvnd_vendor_name},
input : 'main/50_mesa.json',
output: '50_@0@.json'.format(glvnd_vendor_name),
install : true,
install_tag : 'runtime',
install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d')
)
else
pkg.generate(
name : 'egl',
description : 'Mesa EGL Library',