summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2018-04-18 13:29:59 -0700
committerDylan Baker <dylan@pnwbakers.com>2018-05-17 11:06:01 -0700
commit9ed71667be484f1918f9a1b8e4d32bbff172a67f (patch)
tree5d44b0e5a9935762ff1db5cef3a4f6afd66a1077
parenta61d5345fbd560a307508300ad8181eda35f90c8 (diff)
meson: fix graw tests when building against gdi
-rw-r--r--src/gallium/tests/graw/meson.build9
1 files changed, 8 insertions, 1 deletions
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