From 4bf96affd08915e0601b4475d89e01376e55d909 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 10 Dec 2023 18:18:49 +0100 Subject: [PATCH] Cleanup, fix missing lv2 binary Signed-off-by: falkTX --- libs/juce6.1/meson.build | 2 +- meson.build | 11 +++++++++++ ports-juce5/meson.build | 4 ++-- ports-juce6.0/meson.build | 8 ++++---- ports-juce6.1/meson.build | 14 +++++++------- ports-juce7/meson.build | 8 ++++---- scripts/generate-ttl.sh | 1 + 7 files changed, 30 insertions(+), 18 deletions(-) diff --git a/libs/juce6.1/meson.build b/libs/juce6.1/meson.build index ff307217..66fdfab1 100644 --- a/libs/juce6.1/meson.build +++ b/libs/juce6.1/meson.build @@ -55,7 +55,7 @@ if os_windows endif endif -lib_juce6 = static_library('juce61', +lib_juce61 = static_library('juce61', sources: juce61_srcs, include_directories: [ include_directories('.'), diff --git a/meson.build b/meson.build index 3d505ec1..64756d4b 100644 --- a/meson.build +++ b/meson.build @@ -331,6 +331,17 @@ else link_flags += link_flags_release endif +############################################################################### +# set vst3 architecture bundle name + +if os_darwin + vst3_bundle_name = 'MacOS' +elif os_windows + vst3_bundle_name = host_machine.cpu_family() + '-win' +else + vst3_bundle_name = host_machine.cpu_family() + '-' + host_machine.system() +endif + ############################################################################### # go into subdir to build libraries and plugins diff --git a/ports-juce5/meson.build b/ports-juce5/meson.build index c41df79b..88fe7ce8 100644 --- a/ports-juce5/meson.build +++ b/ports-juce5/meson.build @@ -236,7 +236,7 @@ if build_lv2 or build_vst2 link_with_plugin += plugin_lib if build_lv2 - plugin_lv2_lib = shared_library(plugin_name + '_lv2', + plugin_lv2_lib = shared_library(plugin_name + '-lv2', name_prefix: '', sources: plugin_extra_format_specific_srcs, include_directories: [ @@ -250,7 +250,7 @@ if build_lv2 or build_vst2 link_with: link_with_plugin, ) - custom_target(plugin_name + '_lv2-dir', + custom_target(plugin_name + '-lv2-bundle', output: plugin_name + '.lv2', input: plugin_lv2_lib, command: [ '../scripts/generate-ttl.sh', lv2_ttl_generator, '@OUTPUT@', plugin_lv2_lib.full_path() ], diff --git a/ports-juce6.0/meson.build b/ports-juce6.0/meson.build index 497d5116..0ff13d4c 100644 --- a/ports-juce6.0/meson.build +++ b/ports-juce6.0/meson.build @@ -173,7 +173,7 @@ foreach plugin : plugins ) if build_lv2 - plugin_lv2_lib = shared_library(plugin_name + '_lv2', + plugin_lv2_lib = shared_library(plugin_name + '-lv2', name_prefix: '', sources: plugin_extra_format_specific_srcs, include_directories: [ @@ -187,7 +187,7 @@ foreach plugin : plugins link_with: [ lib_juce60, plugin_lib ], ) - custom_target(plugin_name + '_lv2-dir', + custom_target(plugin_name + '-lv2-bundle', output: plugin_name + '.lv2', input: plugin_lv2_lib, command: [ '../scripts/generate-ttl.sh', lv2_ttl_generator, '@OUTPUT@', plugin_lv2_lib.full_path() ], @@ -229,9 +229,9 @@ foreach plugin : plugins link_with: [ lib_juce60, plugin_lib ], ) - plugin_vst3_dir = meson.current_build_dir() / plugin_name + '.vst3' / 'Contents' / host_machine.cpu_family() + '-' + host_machine.system() + plugin_vst3_dir = meson.current_build_dir() / plugin_name + '.vst3' / 'Contents' / vst3_bundle_name - plugin_vst3 = custom_target(plugin_name + '_vst3-bundle', + plugin_vst3 = custom_target(plugin_name + '-vst3-bundle', output: plugin_name + '.vst3', input: plugin_vst3_lib, command: [ diff --git a/ports-juce6.1/meson.build b/ports-juce6.1/meson.build index b1d94858..1c768bb4 100644 --- a/ports-juce6.1/meson.build +++ b/ports-juce6.1/meson.build @@ -180,7 +180,7 @@ foreach plugin : plugins ) if build_lv2 - plugin_lv2_lib = shared_library(plugin_name + '_lv2', + plugin_lv2_lib = shared_library(plugin_name + '-lv2', name_prefix: '', sources: plugin_extra_format_specific_srcs, include_directories: [ @@ -191,10 +191,10 @@ foreach plugin : plugins c_args: build_flags + build_flags_plugin + build_flags_plugin_lv2 + plugin_extra_build_flags, cpp_args: build_flags_cpp + build_flags_plugin + build_flags_plugin_lv2 + build_flag_plugin_cpp + plugin_extra_build_flags, link_args: link_flags + link_flags_plugin_common + link_flags_plugin_lv2 + plugin_extra_link_flags, - link_with: [ lib_juce6, plugin_lib ], + link_with: [ lib_juce61, plugin_lib ], ) - custom_target(plugin_name + '_lv2-dir', + custom_target(plugin_name + '-lv2-bundle', output: plugin_name + '.lv2', input: plugin_lv2_lib, command: [ '../scripts/generate-ttl.sh', lv2_ttl_generator, '@OUTPUT@', plugin_lv2_lib.full_path() ], @@ -215,7 +215,7 @@ foreach plugin : plugins c_args: build_flags + build_flags_plugin + build_flags_plugin_vst2 + plugin_extra_build_flags, cpp_args: build_flags_cpp + build_flags_plugin + build_flags_plugin_vst2 + build_flag_plugin_cpp + plugin_extra_build_flags, link_args: link_flags + link_flags_plugin_common + link_flags_plugin_vst2 + plugin_extra_link_flags, - link_with: [ lib_juce6, plugin_lib ], + link_with: [ lib_juce61, plugin_lib ], install: true, install_dir: vst2dir, ) @@ -233,12 +233,12 @@ foreach plugin : plugins c_args: build_flags + build_flags_plugin + build_flags_plugin_vst3 + plugin_extra_build_flags, cpp_args: build_flags_cpp + build_flags_plugin + build_flags_plugin_vst3 + build_flag_plugin_cpp + plugin_extra_build_flags, link_args: link_flags + link_flags_plugin_common + link_flags_plugin_vst3 + plugin_extra_link_flags, - link_with: [ lib_juce6, plugin_lib ], + link_with: [ lib_juce61, plugin_lib ], ) - plugin_vst3_dir = meson.current_build_dir() / plugin_name + '.vst3' / 'Contents' / host_machine.cpu_family() + '-' + host_machine.system() + plugin_vst3_dir = meson.current_build_dir() / plugin_name + '.vst3' / 'Contents' / vst3_bundle_name - plugin_vst3 = custom_target(plugin_name + '_vst3-bundle', + plugin_vst3 = custom_target(plugin_name + '-vst3-bundle', output: plugin_name + '.vst3', input: plugin_vst3_lib, command: [ diff --git a/ports-juce7/meson.build b/ports-juce7/meson.build index 84102625..ba137a93 100644 --- a/ports-juce7/meson.build +++ b/ports-juce7/meson.build @@ -164,7 +164,7 @@ foreach plugin : plugins ) if build_lv2 - plugin_lv2_lib = shared_library(plugin_name + '_lv2', + plugin_lv2_lib = shared_library(plugin_name + '-lv2', name_prefix: '', sources: plugin_extra_format_specific_srcs, include_directories: [ @@ -180,7 +180,7 @@ foreach plugin : plugins plugin_lv2_dir = meson.current_build_dir() / plugin_name + '.lv2' - custom_target(plugin_name + '_lv2-dir', + custom_target(plugin_name + '-lv2-bundle', output: plugin_name + '.lv2', input: plugin_lv2_lib, command: [ '../scripts/generate-ttl.sh', lv2_ttl_generator, '@OUTPUT@', plugin_lv2_lib.full_path() ], @@ -222,9 +222,9 @@ foreach plugin : plugins link_with: [ lib_juce7, plugin_lib ], ) - plugin_vst3_dir = meson.current_build_dir() / plugin_name + '.vst3' / 'Contents' / host_machine.cpu_family() + '-' + host_machine.system() + plugin_vst3_dir = meson.current_build_dir() / plugin_name + '.vst3' / 'Contents' / vst3_bundle_name - plugin_vst3 = custom_target(plugin_name + '_vst3-bundle', + plugin_vst3 = custom_target(plugin_name + '-vst3-bundle', output: plugin_name + '.vst3', input: plugin_vst3_lib, command: [ diff --git a/scripts/generate-ttl.sh b/scripts/generate-ttl.sh index 26336f53..3dfbe57e 100755 --- a/scripts/generate-ttl.sh +++ b/scripts/generate-ttl.sh @@ -52,4 +52,5 @@ fi mkdir -p "${dir}" cd "${dir}" +cp -v "${lib}" . exec ${MESON_EXE_WRAPPER} "${gen}" "${lib}"