summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2020-08-18 12:58:48 +0200
committerDave Davenport <qball@gmpclient.org>2020-08-18 12:58:48 +0200
commit13d291c6d46ad564c94c161de6579e45834326ac (patch)
treeceffc5a7370d29483093ce0b8980e3e866ef5d1a
parent001a293b186d495c45983504b228281f4c63f7e8 (diff)
parent77b761aca512eed5c8f76dc612584234bac64b81 (diff)
Merge remote-tracking branch 'origin/mesonfix' into next
-rw-r--r--meson.build4
l---------subprojects/xcb1
2 files changed, 4 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index bec08967..9e893842 100644
--- a/meson.build
+++ b/meson.build
@@ -51,9 +51,11 @@ deps = [
c_compiler.find_library('m', required: false),
]
+
+gwxcb = subproject('xcb')
# XCB stuff
deps += [
- subproject('libgwater/xcb').get_variable('libgwater_xcb'),
+ gwxcb.get_variable('libgwater_xcb'),
dependency('xcb-aux'),
dependency('xcb-xkb'),
dependency('xkbcommon-x11'),
diff --git a/subprojects/xcb b/subprojects/xcb
new file mode 120000
index 00000000..b916db37
--- /dev/null
+++ b/subprojects/xcb
@@ -0,0 +1 @@
+libgwater/xcb \ No newline at end of file