Adjust build for juce7 update

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Jul 12, 2022 · b88fedd · b88fedd
1 parent af1152e
commit b88fedd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ bin/vst
 build/
 debian
 intermediate
+juce_lv2_helper
 lv2_ttl_generator
 
 scripts/*.h
@@ -79,4 +80,5 @@ libs/juce*/source/modules/*/native/javaopt/
 libs/juce*/source/modules/*/native/oboe/
 libs/juce*/source/modules/*/native/*_android_*
 libs/juce*/source/modules/*/native/*_ios_*
+libs/juce*/source/modules/*/native/accessibility/*_test.cpp
 libs/juce*/source/tools
diff --git a/libs/juce-plugin/JucePluginMain.cpp b/libs/juce-plugin/JucePluginMain.cpp
@@ -20,7 +20,11 @@
 #if JucePlugin_Build_AU
  #include "modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm"
 #elif JucePlugin_Build_LV2
- #include "modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp"
+ #if JUCE_MAJOR_VERSION >= 7
+  #include "modules/juce_audio_plugin_client/LV2/juce_LV2_Client.cpp"
+ #else
+  #include "modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp"
+ #endif
 #elif JucePlugin_Build_RTAS
  #include "modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp"
 #elif JucePlugin_Build_VST

diff --git a/libs/juce7/AppConfig.h b/libs/juce7/AppConfig.h
@@ -9,6 +9,9 @@
 #ifndef BUILD_JUCE_APPCONFIG_H_INCLUDED
 #define BUILD_JUCE_APPCONFIG_H_INCLUDED
 
+// needed for some plugins
+// #define JUCE_MODAL_LOOPS_PERMITTED 1
+
 #define JUCE_MODULE_AVAILABLE_juce_audio_basics          1
 #define JUCE_MODULE_AVAILABLE_juce_audio_formats         1
 #define JUCE_MODULE_AVAILABLE_juce_audio_plugin_client   1

diff --git a/ports-juce7/meson.build b/ports-juce7/meson.build
@@ -56,6 +56,7 @@ build_flags_plugin_vst3 = [
     '-DJucePlugin_Build_VST=0',
     '-DJucePlugin_Build_VST3=1',
     '-DJucePlugin_Build_Standalone=0',
+    '-Wno-non-virtual-dtor',
 ]
 
 ###############################################################################