summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeha Bhende <bhenden@vmware.com>2020-11-26 08:45:54 -0800
committerMarge Bot <eric+marge@anholt.net>2020-12-03 12:39:01 +0000
commit81702c0ba6bc588d50c11aeb5975eca57bc18848 (patch)
tree8a854a0120c30430a8da92ceef607625fad017b5
parent8955980f17f902d24c50962502a20285dcd11642 (diff)
meson: Don't build svgadrm on windows
Building svgadrm module on window platform is not required. Reviewed-by: Charmaine Lee <charmainel@vmware.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7806>
-rw-r--r--src/gallium/drivers/svga/meson.build7
-rw-r--r--src/gallium/meson.build4
2 files changed, 9 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/meson.build b/src/gallium/drivers/svga/meson.build
index 123013dd47c..d3bdf5c2dee 100644
--- a/src/gallium/drivers/svga/meson.build
+++ b/src/gallium/drivers/svga/meson.build
@@ -90,7 +90,12 @@ libsvga = static_library(
dependencies : idep_mesautil,
)
+svga_deps = [libsvga]
+if not with_platform_windows
+ svga_deps += libsvgadrm
+endif
+
driver_svga = declare_dependency(
compile_args : '-DGALLIUM_VMWGFX',
- link_with : [libsvga, libsvgadrm],
+ link_with : svga_deps,
)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index fed719e2e38..a23e43f6724 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -137,7 +137,9 @@ else
driver_i915 = declare_dependency()
endif
if with_gallium_svga
- subdir('winsys/svga/drm')
+ if not with_platform_windows
+ subdir('winsys/svga/drm')
+ endif
subdir('drivers/svga')
else
driver_svga = declare_dependency()