From d2fe8c17e7baa4cd35290e9886f1d84bd6b57d09 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 5 Sep 2020 00:03:39 +0100 Subject: [PATCH] do soundpipe step automatically --- README.md | 1 - ext/Soundpipe/meson.build | 12 +++++++++++- meson.build | 5 ----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index eebdfe1..efb122e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,6 @@ Building Build and install all plugins - cd ext/Soundpipe && CC=gcc make && cd ../.. meson build ninja -C build ninja -C build install diff --git a/ext/Soundpipe/meson.build b/ext/Soundpipe/meson.build index dd79401..8770797 100644 --- a/ext/Soundpipe/meson.build +++ b/ext/Soundpipe/meson.build @@ -15,13 +15,23 @@ # You should have received a copy of the GNU Affero General Public License # along with ZPlugins. If not, see . +# things that need to be built before +pre_soundpipe = custom_target ( + 'pre-soundpipe', + output: 'pre-soundpipe', + command: [ + 'cd', meson.current_source_dir (), '&&', + 'CC=' + cc.get_id (), 'make', + ]) + subdir('modules') subdir('lib') soundpipe_lib = static_library ( - 'soundpipe', + 'soundpipe-lib', soundpipe_lib_files, soundpipe_module_files, + pre_soundpipe, include_directories: [ 'h', join_paths ('lib', 'dr_wav'), diff --git a/meson.build b/meson.build index f8a6c61..3696d66 100644 --- a/meson.build +++ b/meson.build @@ -140,10 +140,5 @@ if os_windows ] endif -#add_project_arguments ( - #common_cflags, - #language: [ 'c' ] - #) - subdir ('ext') subdir ('plugins')