summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-01-18 16:18:12 +0000
committerAdam Jackson <ajax@redhat.com>2018-01-22 13:50:20 -0500
commit2d29daf4c69385513a322002570ec2c41cfc838f (patch)
treedf09add429692e5aee47127a55feb98ca7130a71
parent514d2c243e01b114de304ea72226bbf8772b1b11 (diff)
meson.build: Fix hw/xwin build when dependencies are installed in a non-default location
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--hw/xwin/glx/meson.build2
-rw-r--r--hw/xwin/winclipboard/meson.build1
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/xwin/glx/meson.build b/hw/xwin/glx/meson.build
index e9969536d..57cce039d 100644
--- a/hw/xwin/glx/meson.build
+++ b/hw/xwin/glx/meson.build
@@ -75,7 +75,7 @@ xwin_glx = static_library(
top_srcdir_inc,
include_directories('../'),
],
- dependencies: pixman_dep,
+ dependencies: common_dep,
c_args: xwin_glx_c_args,
)
diff --git a/hw/xwin/winclipboard/meson.build b/hw/xwin/winclipboard/meson.build
index 1c784c384..dd7b2d20e 100644
--- a/hw/xwin/winclipboard/meson.build
+++ b/hw/xwin/winclipboard/meson.build
@@ -27,5 +27,6 @@ executable(
srcs_xwinclip,
link_with: xwin_clipboard,
link_args: ['-lgdi32', '-lpthread'],
+ dependencies: [dependency('x11')],
install: true,
)