From 9ed71667be484f1918f9a1b8e4d32bbff172a67f Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 18 Apr 2018 13:29:59 -0700
Subject: meson: fix graw tests when building against gdi

---
 src/gallium/tests/graw/meson.build | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gallium/tests/graw/meson.build b/src/gallium/tests/graw/meson.build
index fd416c1628..19e47eb004 100644
--- a/src/gallium/tests/graw/meson.build
+++ b/src/gallium/tests/graw/meson.build
@@ -25,12 +25,19 @@ progs = [
   'vs-test',
 ]
 
+# Adding libgallium with mingw causes duplicate definition errors, without it
+# x11 based graw wont link.
+graw_link = []
+if with_platform_x11
+  graw_link += libgallium
+endif
+
 foreach t : progs
   executable(
     'graw-' + t,
     t + '.c',
     include_directories : inc_common,
-    link_with : [libgraw, libgraw_util, libmesa_util, libgallium],
+    link_with : [libgraw, libgraw_util, libmesa_util, graw_link],
     dependencies : [dep_m, dep_thread]
   )
 endforeach
-- 
cgit v1.2.3