aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2019-07-23 20:55:34 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2019-07-23 20:55:34 +0200
commit44571128e984f45187b3e53b6a4c9432bd3b45fc (patch)
tree324876b94f89252303ce67815af6ccc710443c25
parent1f04fa1139d47c7782c57536e1072d9149612e2f (diff)
downloadsynthpod-44571128e984f45187b3e53b6a4c9432bd3b45fc.tar.xz
Squashed 'subprojects/d2tk/' changes from e055e67a..1860aa65
1860aa65 meson: untangle dependencies. git-subtree-dir: subprojects/d2tk git-subtree-split: 1860aa65bc20407914a4c6ec5f6282eb79a17916
-rw-r--r--VERSION2
-rw-r--r--meson.build16
2 files changed, 12 insertions, 6 deletions
diff --git a/VERSION b/VERSION
index fbfdff1f..8bb0d098 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.745
+0.1.747
diff --git a/meson.build b/meson.build
index 4e1f4dde..5160e870 100644
--- a/meson.build
+++ b/meson.build
@@ -67,7 +67,10 @@ bin_srcs = [
]
pugl_srcs = [
- join_paths('src', 'frontend_pugl.c'),
+ join_paths('src', 'frontend_pugl.c')
+]
+
+pugl_bin_srcs = [
join_paths('example', 'd2tk_pugl.c')
]
@@ -82,7 +85,10 @@ cairo_srcs = [
]
fbdev_srcs = [
- join_paths('src', 'frontend_fbdev.c'),
+ join_paths('src', 'frontend_fbdev.c')
+]
+
+fbdev_bin_srcs = [
join_paths('example', 'd2tk_fbdev.c')
]
@@ -126,7 +132,7 @@ if freetype_dep.found() and pixman_dep.found() and cairo_dep.found() and (host_m
link_args : links,
sources : [lib_srcs, cairo_srcs, pugl_srcs])
- executable('d2tk.cairo', [bin_srcs],
+ executable('d2tk.cairo', [bin_srcs, pugl_bin_srcs],
c_args : c_args,
include_directories : inc_dir,
dependencies: d2tk_cairo,
@@ -139,7 +145,7 @@ if freetype_dep.found() and pixman_dep.found() and cairo_dep.found() and (host_m
link_args : links,
sources : [lib_srcs, cairo_srcs, fbdev_srcs])
- executable('d2tk.fbdev', [bin_srcs],
+ executable('d2tk.fbdev', [bin_srcs, fbdev_bin_srcs],
c_args : c_args,
include_directories : inc_dir,
dependencies: d2tk_fbdev,
@@ -153,7 +159,7 @@ d2tk_nanovg = declare_dependency(
link_args : links,
sources : [lib_srcs, nanovg_srcs, pugl_srcs])
-executable('d2tk.nanovg', [bin_srcs],
+executable('d2tk.nanovg', [bin_srcs, pugl_bin_srcs],
c_args : c_args,
include_directories : inc_dir,
dependencies: d2tk_nanovg,