meson: add libswdri and libswkmsdri to d3dadaptor link_with

v5: - Fix libswdi -> libswdri typo

Fixes: 6b4c7047d5 ("meson: build gallium nine state_tracker")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Dylan Baker 2018-02-12 10:58:58 -08:00
parent d672084ba2
commit be879f9f29
1 changed files with 3 additions and 10 deletions

View File

@ -1,4 +1,5 @@
# Copyright © 2017 Dylan Baker
# Copyright © 2018 Intel Corporation
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@ -31,20 +32,12 @@ gallium_nine_c_args = [
]
gallium_nine_ld_args = []
gallium_nine_link_depends = []
gallium_nine_link_with = []
if with_ld_version_script
gallium_nine_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'd3dadapter9.sym')]
gallium_nine_link_depends += files('d3dadapter9.sym')
endif
if with_dri
gallium_nine_link_with += libswdri
endif
if with_gallium_drisw_kms
gallium_nine_link_with += libswkmsdri
endif
libgallium_nine = shared_library(
'd3dadapter9',
[files('description.c', 'getproc.c', 'drm.c'), xmlpool_options_h],
@ -60,8 +53,8 @@ libgallium_nine = shared_library(
link_depends : gallium_nine_link_depends,
link_with : [
libgalliumvl_stub, libgallium, libnine_st, libmesa_util, libddebug,
librbug, libtrace, libpipe_loader_static, libws_null, libwsw,
gallium_nine_link_with,
librbug, libtrace, libpipe_loader_static, libws_null, libwsw, libswdri,
libswkmsdri,
],
dependencies : [
dep_selinux, dep_expat, dep_libdrm, dep_llvm,