Mesa (master): meson: Don't build svgadrm on windows
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 3 12:56:32 UTC 2020
Module: Mesa
Branch: master
Commit: 81702c0ba6bc588d50c11aeb5975eca57bc18848
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=81702c0ba6bc588d50c11aeb5975eca57bc18848
Author: Neha Bhende <bhenden at vmware.com>
Date: Thu Nov 26 08:45:54 2020 -0800
meson: Don't build svgadrm on windows
Building svgadrm module on window platform is not required.
Reviewed-by: Charmaine Lee <charmainel at vmware.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7806>
---
src/gallium/drivers/svga/meson.build | 7 ++++++-
src/gallium/meson.build | 4 +++-
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()
More information about the mesa-commit
mailing list