diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index c679c98..1ee2f9a 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -31,6 +31,8 @@ jobs: juce_version: 8.0.10 - os: ubuntu-22.04 juce_version: 8.0.11 + - os: ubuntu-22.04 + juce_version: 9.0.0 - os: windows-latest juce_version: 6.1.6 @@ -42,16 +44,20 @@ jobs: juce_version: 8.0.10 - os: windows-latest juce_version: 8.0.11 + - os: windows-latest + juce_version: 9.0.0 - os: macOS-latest juce_version: 8.0.11 + - os: macOS-latest + juce_version: 9.0.0 steps: - name: Install Linux Deps if: runner.os == 'Linux' run: | sudo apt-get update - sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libfontconfig1-dev libglu1-mesa-dev libjack-jackd2-dev + sudo apt install libasound2-dev libx11-dev libxcomposite-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxrender-dev libfreetype6-dev libfontconfig1-dev libglu1-mesa-dev libjack-jackd2-dev sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11 diff --git a/src/wrapper/clap-juce-wrapper.cpp b/src/wrapper/clap-juce-wrapper.cpp index 39882a0..d2d010d 100644 --- a/src/wrapper/clap-juce-wrapper.cpp +++ b/src/wrapper/clap-juce-wrapper.cpp @@ -2455,11 +2455,18 @@ class ClapJuceWrapper : public clap::helpers::Plugin< #if JUCE_VERSION < 0x070006 juce::initialiseMacVST(); auto hostWindow = juce::attachComponentToWindowRefVST(editorWrapper.get(), nsView, true); -#else +#elif JUCE_VERSION < 0x090000 const auto desktopFlags = juce::detail::PluginUtilities::getDesktopFlags(editorWrapper->editor.get()); auto hostWindow = juce::detail::VSTWindowUtilities::attachComponentToWindowRefVST( editorWrapper.get(), desktopFlags, nsView); +#else + const auto desktopFlags = + juce::detail::PluginUtilities::getDesktopFlagsAndWindowsMultiTouchMode( + editorWrapper->editor.get()) + .desktopFlags; + auto hostWindow = juce::detail::VSTWindowUtilities::attachComponentToWindowRefVST( + editorWrapper.get(), desktopFlags, nsView); #endif juce::ignoreUnused(hostWindow); return true;