meson: Fix broken AU build

zsbzsb · Oct 18, 2022 · cc8c5b1 · cc8c5b1
1 parent e5a7896
commit cc8c5b1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/libs/compat/meson.build b/libs/compat/meson.build
@@ -106,6 +106,9 @@ juce_sources += 'include_juce_audio_processors_lv2_libs.cpp'
 juce_conf_data.set10 ('JUCE_PLUGINHOST_LV2', true)
 juce_conf_data.set10 ('JUCE_PLUGINHOST_LADSPA', cpp.check_header ('ladspa.h'))
 
+### AudioUnit
+juce_au_includes = []
+
 if host_machine.system() == 'linux'
     alsa_dep = dependency ('alsa', required : false)
     juce_conf_data.set10 ('JUCE_ALSA', alsa_dep.found())
@@ -139,15 +142,24 @@ elif host_machine.system() == 'darwin'
         'accelerate', 'audiotoolbox', 'audiounit', 'coreaudio',
         'coreaudiokit', 'coremidi', 'cocoa', 'carbon',
         'discrecording', 'iokit', 'quartzcore', 'metal' ])
-    juce_conf_data.set10 ('JUCE_PLUGINHOST_AU', true)     
+    juce_conf_data.set10 ('JUCE_PLUGINHOST_AU', true)
+    juce_au_includes = include_directories (
+        '../JUCE/modules/juce_audio_plugin_client/AU')
 endif
 
 configure_file (output : 'juce_config.h', 
                 configuration : juce_conf_data)
 
 libelement_juce = static_library ('element_juce', 
     juce_sources,
-    include_directories : [ juce_includes, asio_includes, vst3_includes, vst2_includes, lv2_includes ],
+    include_directories : [ 
+        juce_includes, 
+        asio_includes, 
+        vst3_includes, 
+        vst2_includes, 
+        lv2_includes,
+        juce_au_includes
+    ],
     gnu_symbol_visibility : 'hidden',
     dependencies : deps,
     install : false)

diff --git a/src/plugins/effect/au/meson.build b/src/plugins/effect/au/meson.build
@@ -22,7 +22,7 @@ element_au = shared_module ('KV-Element-FX',
     install_dir : element_fx_au_install_dir,
     gnu_symbol_visibility : 'hidden',
     dependencies : element_app_deps,
-    include_directories : [ '..', libelement_includes ],
+    include_directories : [ '..', libelement_includes, juce_au_includes ],
     cpp_args : [ '-DJucePlugin_Build_AU=1' ],
     objcpp_args : [ '-DJucePlugin_Build_AU=1' ],
     link_args : element_app_link_args,

diff --git a/src/plugins/instrument/au/meson.build b/src/plugins/instrument/au/meson.build
@@ -22,7 +22,7 @@ element_au = shared_module ('KV-Element',
     install_dir : element_au_install_dir,
     gnu_symbol_visibility : 'hidden',
     dependencies : element_app_deps,
-    include_directories : [ '..', libelement_includes ],
+    include_directories : [ '..', libelement_includes, juce_au_includes ],
     cpp_args : [ '-DJucePlugin_Build_AU=1' ],
     objcpp_args : [ '-DJucePlugin_Build_AU=1' ],
     link_args : element_app_link_args,

diff --git a/src/plugins/macvstutils.mm b/src/plugins/macvstutils.mm
@@ -1,3 +1,3 @@
 #include "juce_config.h"
 #include "pluginconfig.h"
-#include "../../libs/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm"
+#include "./../../libs/JUCE/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm"
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
@@ -11,12 +11,10 @@ elif host_machine.system() == 'darwin'
     element_vst3_bindir = 'MacOS'
 endif
 
-if  host_machine.system() != 'darwin'
-    subdir ('instrument/au')
-    subdir ('instrument/vst2')
-    subdir ('instrument/vst3')
-    subdir ('effect/au')
-    subdir ('effect/vst2')
-    subdir ('effect/vst3')
-    subdir ('midieffect/au')
-endif
+subdir ('instrument/au')
+subdir ('instrument/vst2')
+subdir ('instrument/vst3')
+subdir ('effect/au')
+subdir ('effect/vst2')
+subdir ('effect/vst3')
+subdir ('midieffect/au')
diff --git a/src/plugins/midieffect/au/meson.build b/src/plugins/midieffect/au/meson.build
@@ -22,7 +22,7 @@ element_au = shared_module ('KV-Element-MFX',
     install_dir : element_mfx_au_install_dir,
     gnu_symbol_visibility : 'hidden',
     dependencies : element_app_deps,
-    include_directories : [ '..', libelement_includes ],
+    include_directories : [ '..', libelement_includes, juce_au_includes ],
     cpp_args : [ '-DJucePlugin_Build_AU=1' ],
     objcpp_args : [ '-DJucePlugin_Build_AU=1' ],
     link_args : element_app_link_args,