aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-04-10 09:00:14 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-04-10 09:00:14 +0200
commit92331926684cc98621e9b200ee132195602092f4 (patch)
treea010a896277e0b27b97736ba4ce9cc0c2ba61adc
parent3afcfc675484424c19b83ce90af5c64a92694f5f (diff)
downloadsynthpod-92331926684cc98621e9b200ee132195602092f4.zip
synthpod-92331926684cc98621e9b200ee132195602092f4.tar.gz
synthpod-92331926684cc98621e9b200ee132195602092f4.tar.bz2
synthpod-92331926684cc98621e9b200ee132195602092f4.tar.xz
add more meson recipes for binaries.
-rw-r--r--VERSION2
-rw-r--r--app/meson.build2
-rw-r--r--bin/meson.build93
-rw-r--r--meson.build10
4 files changed, 96 insertions, 11 deletions
diff --git a/VERSION b/VERSION
index f1a09e0..1c81adb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.5603
+0.1.5605
diff --git a/app/meson.build b/app/meson.build
index 6fe5da9..59e18b2 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -9,6 +9,6 @@ srcs = ['synthpod_app.c',
incs = [inc_incs, app_incs, xpress_incs, osc_incs, extui_incs, ardour_incs, varchunk_incs, crossclock_incs]
deps = [m_dep, rt_dep, lv2_dep, thread_dep, lilv_dep]
-app = static_library('synthpod.app', srcs,
+app = static_library('synthpod_app', srcs,
include_directories : incs,
dependencies : deps)
diff --git a/bin/meson.build b/bin/meson.build
index 6e05671..1424b6f 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -1,13 +1,88 @@
-dummy_srcs = ['synthpod_dummy.c',
- 'synthpod_bin.c',
- 'nsmc.c'
-]
+bin_incs = [inc_incs, app_incs, xpress_incs, osc_incs, extui_incs, ardour_incs, varchunk_incs, crossclock_incs, lfrtm_incs, mapper_incs, sbox_incs]
+bin_deps = [m_dep, rt_dep, lv2_dep, thread_dep, lilv_dep]
-incs = [inc_incs, app_incs, xpress_incs, osc_incs, extui_incs, ardour_incs, varchunk_incs, crossclock_incs, lfrtm_incs, mapper_incs, sbox_incs]
-deps = [m_dep, rt_dep, lv2_dep, thread_dep, lilv_dep]
+bin_srcs = ['synthpod_bin.c',
+ 'nsmc.c']
+
+bin = static_library('synthpod_bin', bin_srcs,
+ include_directories : bin_incs,
+ dependencies : bin_deps)
+
+dummy_srcs = ['synthpod_dummy.c']
dummy = executable('synthpod_dummy', dummy_srcs,
- include_directories : incs,
- dependencies : deps,
- link_with : [app, sbox_master],
+ include_directories : bin_incs,
+ dependencies : bin_deps,
+ link_with : [bin, app, sbox_master],
install : true)
+
+if alsa_dep.found() and zita_dep.found()
+ add_languages('cpp')
+ alsa_srcs = ['synthpod_alsa.c', 'pcmi.cpp']
+
+ alsa = executable('synthpod_alsa', alsa_srcs,
+ include_directories : bin_incs,
+ dependencies : [bin_deps, alsa_dep, zita_dep],
+ link_with : [bin, app, sbox_master],
+ install : true)
+endif
+
+if jack_dep.found()
+ jack_srcs = ['synthpod_jack.c']
+
+ jack = executable('synthpod_jack', jack_srcs,
+ include_directories : bin_incs,
+ dependencies : [bin_deps, jack_dep],
+ link_with : [bin, app, sbox_master],
+ install : true)
+endif
+
+if xcb_dep.found() and xcbicccm_dep.found()
+ x11_srcs = ['synthpod_sandbox_x11.c']
+
+ x11 = executable('synthpod_sandbox_x11', x11_srcs,
+ include_directories : bin_incs,
+ dependencies : [rt_dep, thread_dep, xcb_dep, xcbicccm_dep],
+ link_with : [sbox_slave],
+ install : true)
+endif
+
+if gtk2_dep.found()
+ gtk2_srcs = ['synthpod_sandbox_gtk.c']
+
+ gtk2 = executable('synthpod_sandbox_gtk2', gtk2_srcs,
+ include_directories : bin_incs,
+ dependencies : [rt_dep, thread_dep, gtk2_dep],
+ link_with : [sbox_slave],
+ install : true)
+endif
+
+if gtk3_dep.found()
+ gtk3_srcs = ['synthpod_sandbox_gtk.c']
+
+ gtk3 = executable('synthpod_sandbox_gtk3', gtk3_srcs,
+ include_directories : bin_incs,
+ dependencies : [rt_dep, thread_dep, gtk3_dep],
+ link_with : [sbox_slave],
+ install : true)
+endif
+
+if true #FIXME only build with enabled UI
+ show_srcs = ['synthpod_sandbox_show.c']
+
+ gtk3 = executable('synthpod_sandbox_show', show_srcs,
+ include_directories : bin_incs,
+ dependencies : [rt_dep, thread_dep],
+ link_with : [sbox_slave],
+ install : true)
+endif
+
+if true #FIXME only build with enabled UI
+ kx_srcs = ['synthpod_sandbox_kx.c']
+
+ gtk3 = executable('synthpod_sandbox_kx', kx_srcs,
+ include_directories : bin_incs,
+ dependencies : [rt_dep, thread_dep],
+ link_with : [sbox_slave],
+ install : true)
+endif
diff --git a/meson.build b/meson.build
index c3928df..d6da6f9 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,16 @@ lv2_dep = dependency('lv2', version : '>=1.14.0')
thread_dep = dependency('threads')
lilv_dep = dependency('lilv-0', version : '>=0.24.0',
static : meson.is_cross_build())
+alsa_dep = dependency('alsa', version : '>=1.1.0', required : false)
+zita_dep = cc.find_library('zita-alsa-pcmi', required : false)
+jack_dep = dependency('jack', required : false)
+gl_dep = dependency('gl')
+x11_dep = dependency('x11', version : '>=1.6.0')
+xext_dep = dependency('xext', version : '>=1.3.0')
+xcb_dep = dependency('xcb', version : '>=1.13')
+xcbicccm_dep = dependency('xcb-icccm', version : '>=0.4.0')
+gtk2_dep = dependency('gtk+-2.0', version : '>=2.24')
+gtk3_dep = dependency('gtk+-3.0', version : '>=3.22')
rawvers = run_command('cat', 'VERSION').stdout().strip()
version = rawvers.split('.')