aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2018-04-10 19:26:57 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2018-04-10 19:26:57 +0200
commit033dabe4603060066420c46ffc2b579355dfdc33 (patch)
treea8d5c8e674b02f3891ca800d0035c07f7a3364c0
parent92331926684cc98621e9b200ee132195602092f4 (diff)
downloadsynthpod-033dabe4603060066420c46ffc2b579355dfdc33.tar.xz
add more meson recipes for binaries.
-rw-r--r--VERSION2
-rw-r--r--app/meson.build1
-rw-r--r--bin/meson.build35
-rw-r--r--meson.build16
-rw-r--r--sandbox_ui.lv2/meson.build2
5 files changed, 48 insertions, 8 deletions
diff --git a/VERSION b/VERSION
index 1c81adb0..db095573 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.5605
+0.1.5607
diff --git a/app/meson.build b/app/meson.build
index 59e18b2f..f3692fd0 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -11,4 +11,5 @@ deps = [m_dep, rt_dep, lv2_dep, thread_dep, lilv_dep]
app = static_library('synthpod_app', srcs,
include_directories : incs,
+ c_args : c_args,
dependencies : deps)
diff --git a/bin/meson.build b/bin/meson.build
index 1424b6f1..c42ab66a 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -6,12 +6,14 @@ bin_srcs = ['synthpod_bin.c',
bin = static_library('synthpod_bin', bin_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : bin_deps)
dummy_srcs = ['synthpod_dummy.c']
dummy = executable('synthpod_dummy', dummy_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : bin_deps,
link_with : [bin, app, sbox_master],
install : true)
@@ -22,6 +24,7 @@ if alsa_dep.found() and zita_dep.found()
alsa = executable('synthpod_alsa', alsa_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : [bin_deps, alsa_dep, zita_dep],
link_with : [bin, app, sbox_master],
install : true)
@@ -32,6 +35,7 @@ if jack_dep.found()
jack = executable('synthpod_jack', jack_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : [bin_deps, jack_dep],
link_with : [bin, app, sbox_master],
install : true)
@@ -42,6 +46,7 @@ if xcb_dep.found() and xcbicccm_dep.found()
x11 = executable('synthpod_sandbox_x11', x11_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : [rt_dep, thread_dep, xcb_dep, xcbicccm_dep],
link_with : [sbox_slave],
install : true)
@@ -52,6 +57,7 @@ if gtk2_dep.found()
gtk2 = executable('synthpod_sandbox_gtk2', gtk2_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : [rt_dep, thread_dep, gtk2_dep],
link_with : [sbox_slave],
install : true)
@@ -62,16 +68,44 @@ if gtk3_dep.found()
gtk3 = executable('synthpod_sandbox_gtk3', gtk3_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : [rt_dep, thread_dep, gtk3_dep],
link_with : [sbox_slave],
install : true)
endif
+if qt4_dep.found()
+ add_languages('cpp')
+ qt4_srcs = ['synthpod_sandbox_qt.cpp']
+
+ qt4 = executable('synthpod_sandbox_qt4', qt4_srcs,
+ include_directories : bin_incs,
+ cpp_args : '-DSYNTHPOD_SANDBOX_QT=4',
+ c_args : c_args,
+ dependencies : [rt_dep, thread_dep, qt4_dep],
+ link_with : [sbox_slave],
+ install : true)
+endif
+
+if qt5_dep.found()
+ add_languages('cpp')
+ qt5_srcs = ['synthpod_sandbox_qt.cpp']
+
+ qt5 = executable('synthpod_sandbox_qt5', qt5_srcs,
+ include_directories : bin_incs,
+ cpp_args : '-DSYNTHPOD_SANDBOX_QT=5',
+ c_args : c_args,
+ dependencies : [rt_dep, thread_dep, qt5_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,
+ c_args : c_args,
dependencies : [rt_dep, thread_dep],
link_with : [sbox_slave],
install : true)
@@ -82,6 +116,7 @@ if true #FIXME only build with enabled UI
gtk3 = executable('synthpod_sandbox_kx', kx_srcs,
include_directories : bin_incs,
+ c_args : c_args,
dependencies : [rt_dep, thread_dep],
link_with : [sbox_slave],
install : true)
diff --git a/meson.build b/meson.build
index d6da6f95..56e2c472 100644
--- a/meson.build
+++ b/meson.build
@@ -29,13 +29,15 @@ lilv_dep = dependency('lilv-0', version : '>=0.24.0',
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')
+gl_dep = dependency('gl', required : false)
+x11_dep = dependency('x11', version : '>=1.6.0', required : false)
+xext_dep = dependency('xext', version : '>=1.3.0', required : false)
+xcb_dep = dependency('xcb', version : '>=1.13', required : false)
+xcbicccm_dep = dependency('xcb-icccm', version : '>=0.4.0', required : false)
+gtk2_dep = dependency('gtk+-2.0', version : '>=2.24', required : false)
+gtk3_dep = dependency('gtk+-3.0', version : '>=3.22', required : false)
+qt4_dep = dependency('qt4', modules : ['Core', 'Gui'], required : false)
+qt5_dep = dependency('qt5', modules : ['Core', 'Widgets', 'Gui'], required : false)
rawvers = run_command('cat', 'VERSION').stdout().strip()
version = rawvers.split('.')
diff --git a/sandbox_ui.lv2/meson.build b/sandbox_ui.lv2/meson.build
index e6318d3b..bdb679ce 100644
--- a/sandbox_ui.lv2/meson.build
+++ b/sandbox_ui.lv2/meson.build
@@ -1,7 +1,9 @@
sbox_master = static_library('sbox_master', 'sandbox_master.c',
include_directories : [varchunk_incs, mapper_incs, netatom_incs],
+ c_args : c_args,
dependencies : [lilv_dep])
sbox_slave = static_library('sbox_slave', 'sandbox_slave.c',
include_directories : [varchunk_incs, mapper_incs, netatom_incs],
+ c_args : c_args,
dependencies : [lilv_dep])