meson: lift driver-collection out into parent build-file
This way we can mark the dri_drivers and dri_link arrays as temporary, as all knowledge about them are contained in a single build-file with clearly visible limited life-span. Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
parent
c14b13d0ff
commit
28f18915b8
|
@ -92,6 +92,3 @@ libi915 = static_library(
|
|||
cpp_args : [cpp_vis_args],
|
||||
dependencies : [dep_libdrm, dep_libdrm_intel],
|
||||
)
|
||||
|
||||
dri_drivers += libi915
|
||||
dri_link += 'i915_dri.so'
|
||||
|
|
|
@ -162,6 +162,3 @@ libi965 = static_library(
|
|||
],
|
||||
dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml],
|
||||
)
|
||||
|
||||
dri_drivers += libi965
|
||||
dri_link += 'i965_dri.so'
|
||||
|
|
|
@ -20,32 +20,44 @@
|
|||
|
||||
subdir('common')
|
||||
|
||||
dri_drivers = []
|
||||
dri_link = []
|
||||
_dri_drivers = []
|
||||
_dri_link = []
|
||||
if with_dri_swrast
|
||||
subdir('swrast')
|
||||
_dri_drivers += libswrast_dri
|
||||
_dri_link += 'swrast_dri.so'
|
||||
endif
|
||||
if with_dri_i915
|
||||
subdir('i915')
|
||||
_dri_drivers += libi915
|
||||
_dri_link += 'i915_dri.so'
|
||||
endif
|
||||
if with_dri_i965
|
||||
subdir('i965')
|
||||
_dri_drivers += libi965
|
||||
_dri_link += 'i965_dri.so'
|
||||
endif
|
||||
if with_dri_r100
|
||||
subdir('radeon')
|
||||
_dri_drivers += libr100
|
||||
_dri_link += 'radeon_dri.so'
|
||||
endif
|
||||
if with_dri_r200
|
||||
subdir('r200')
|
||||
_dri_drivers += libr200
|
||||
_dri_link += 'r200_dri.so'
|
||||
endif
|
||||
if with_dri_nouveau
|
||||
subdir('nouveau')
|
||||
_dri_drivers += libnouveau_vieux
|
||||
_dri_link += 'nouveau_vieux_dri.so'
|
||||
endif
|
||||
|
||||
if dri_drivers != []
|
||||
if _dri_drivers != []
|
||||
libmesa_dri_drivers = shared_library(
|
||||
'mesa_dri_drivers',
|
||||
[],
|
||||
link_whole : dri_drivers,
|
||||
link_whole : _dri_drivers,
|
||||
link_with : [
|
||||
libmegadriver_stub, libdricommon, libxmlconfig, libglapi, libmesa_util,
|
||||
libmesa_classic,
|
||||
|
@ -65,7 +77,7 @@ if dri_drivers != []
|
|||
join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
|
||||
libmesa_dri_drivers.full_path(),
|
||||
dri_drivers_path,
|
||||
dri_link,
|
||||
_dri_link,
|
||||
)
|
||||
endif
|
||||
|
||||
|
|
|
@ -87,6 +87,3 @@ libnouveau_vieux = static_library(
|
|||
cpp_args : [cpp_vis_args],
|
||||
dependencies : [dep_libdrm, dep_libdrm_nouveau],
|
||||
)
|
||||
|
||||
dri_drivers += libnouveau_vieux
|
||||
dri_link += 'nouveau_vieux_dri.so'
|
||||
|
|
|
@ -86,6 +86,3 @@ libr200 = static_library(
|
|||
cpp_args : [cpp_vis_args],
|
||||
dependencies : [dep_libdrm, dep_libdrm_radeon],
|
||||
)
|
||||
|
||||
dri_drivers += libr200
|
||||
dri_link += 'r200_dri.so'
|
||||
|
|
|
@ -82,6 +82,3 @@ libr100 = static_library(
|
|||
cpp_args : [cpp_vis_args],
|
||||
dependencies : [dep_libdrm, dep_libdrm_radeon],
|
||||
)
|
||||
|
||||
dri_drivers += libr100
|
||||
dri_link += 'radeon_dri.so'
|
||||
|
|
|
@ -25,6 +25,3 @@ libswrast_dri = static_library(
|
|||
include_directories : [inc_common, inc_dri_common],
|
||||
dependencies : dep_libdrm,
|
||||
)
|
||||
|
||||
dri_drivers += libswrast_dri
|
||||
dri_link += 'swrast_dri.so'
|
||||
|
|
Loading…
Reference in New Issue