From 1276f97a8f30185e090256052b85d3c56222d47c Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Mon, 6 Nov 2023 17:46:49 +0100 Subject: [PATCH] meson: update lfrtm for subproject usage --- VERSION | 2 +- bin/synthpod_bin.h | 1 - meson.build | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 15a0a7d6..424dadca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.6535 +0.1.6599 diff --git a/bin/synthpod_bin.h b/bin/synthpod_bin.h index 9792e2e3..5f61fe71 100644 --- a/bin/synthpod_bin.h +++ b/bin/synthpod_bin.h @@ -25,7 +25,6 @@ #include -#define LFRTM_IMPLEMENTATION #include #define MAPPER_IMPLEMENTATION diff --git a/meson.build b/meson.build index b9145fc5..e71068c7 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,7 @@ build_root = meson.build_root() d2tk = subproject('d2tk') nk_pugl = subproject('nk_pugl') +lfrtm = subproject('lfrtm') if get_option('use-backend-nanovg').enabled() d2tk_dep = d2tk.get_variable('d2tk_nanovg') @@ -19,6 +20,7 @@ else endif nk_pugl_dep = nk_pugl.get_variable('nk_pugl_gl') +lfrtm_dep = lfrtm.get_variable('lfrtm') cc = meson.get_compiler('c') lv2_validate = find_program('lv2_validate', native : true, required : false) @@ -35,7 +37,6 @@ extui_incs = include_directories('ext_ui.lv2') ardour_incs = include_directories('ardour.lv2') varchunk_incs = include_directories('varchunk') crossclock_incs = include_directories('cross_clock') -lfrtm_incs = include_directories('lfrtm') mapper_incs = include_directories('mapper.lv2') sbox_incs = include_directories('sandbox_ui.lv2') netatom_incs = include_directories('netatom.lv2') @@ -44,7 +45,7 @@ jackey_incs = include_directories('jackey') nsmc_incs = include_directories('nsmc') self_incs = include_directories('') -bin_incs = [inc_incs, binbin_incs, app_incs, xpress_incs, osc_incs, canvas_incs, extui_incs, ardour_incs, varchunk_incs, crossclock_incs, lfrtm_incs, mapper_incs, sbox_incs, props_incs, jackey_incs, nsmc_incs, self_incs, netatom_incs] +bin_incs = [inc_incs, binbin_incs, app_incs, xpress_incs, osc_incs, canvas_incs, extui_incs, ardour_incs, varchunk_incs, crossclock_incs, mapper_incs, sbox_incs, props_incs, jackey_incs, nsmc_incs, self_incs, netatom_incs] static_link = meson.is_cross_build() and false #FIXME @@ -79,7 +80,7 @@ qt4_dep = dependency('qt4', modules : ['Core', 'Gui'], required : use_qt4) qt5_dep = dependency('qt5', modules : ['Core', 'Widgets', 'Gui'], required : use_qt5) cairo_dep = dependency('cairo', static : static_link, required : false) -bin_deps = [m_dep, rt_dep, lv2_dep, thread_dep, lilv_dep, sratom_dep] +bin_deps = [m_dep, rt_dep, lv2_dep, thread_dep, lilv_dep, sratom_dep, lfrtm_dep] rawvers = run_command('cat', 'VERSION').stdout().strip() version = rawvers.split('.') -- 2.38.5