From b62d684a24f179cc969f086d53f7c7656cc36ca4 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 18 Feb 2024 14:50:14 -0500 Subject: [PATCH] Upgrade to Juce 7.1.0 / Clap 1.2.0 (#142) Seems to work great on my mac! --- CMakeLists.txt | 8 ++++++-- lib/JUCE | 2 +- lib/clap-juce-extensions | 2 +- src/InfoDialog.cpp | 8 +++++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1089c86..d6c16c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ cmake_minimum_required(VERSION 3.16) # always statically link c runtime on windows set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +set(CMAKE_POSITION_INDEPENDENT_CODE ON) # default to 10.11 (earlier versions will fail) if (NOT DEFINED STOCHAS_MAC_SDK_VER) @@ -19,10 +20,13 @@ endif() set(CMAKE_OSX_DEPLOYMENT_TARGET ${STOCHAS_MAC_SDK_VER} CACHE STRING "Build for ${STOCHAS_MAC_SDK_VER}") if (NOT DEFINED STOCHAS_VERSION) - set (STOCHAS_VERSION 1.3.0) + set (STOCHAS_VERSION 1.3.10) endif() project(Stochas VERSION ${STOCHAS_VERSION}) + +option(STOCHAS_COPY_AFTER_BUILD FALSE "Copy after build") + message( STATUS "Building Stochas with version ${STOCHAS_VERSION}" ) if( APPLE ) message( STATUS "Building using ${CMAKE_OSX_DEPLOYMENT_TARGET}" ) @@ -85,7 +89,7 @@ juce_add_plugin(stochas NEEDS_MIDI_OUTPUT TRUE IS_MIDI_EFFECT ${STOCHAS_IS_MIDI_EFFECT} # EDITOR_WANTS_KEYBOARD_FOCUS TRUE/FALSE # Does the editor need keyboard focus? - # COPY_PLUGIN_AFTER_BUILD TRUE/FALSE # Should the plugin be installed to a default location after building? + COPY_PLUGIN_AFTER_BUILD ${STOCHAS_COPY_AFTER_BUILD} # Should the plugin be installed to a default location after building? PLUGIN_MANUFACTURER_CODE AuVi # allows compatibility with older patches from AV days PLUGIN_CODE Stoc FORMATS VST3 ${VST2} AU Standalone # The formats to build. Other valid formats are: AAX Unity VST AU AUv3 diff --git a/lib/JUCE b/lib/JUCE index 2f98020..a8ae6ed 160000 --- a/lib/JUCE +++ b/lib/JUCE @@ -1 +1 @@ -Subproject commit 2f980209cc4091a4490bb1bafc5d530f16834e58 +Subproject commit a8ae6edda6d3be78a139ec5e429dc57ef047e82a diff --git a/lib/clap-juce-extensions b/lib/clap-juce-extensions index 060d430..e72d59a 160000 --- a/lib/clap-juce-extensions +++ b/lib/clap-juce-extensions @@ -1 +1 @@ -Subproject commit 060d4307f1c3ec4acc1f9ca1b5a2794d38c5d867 +Subproject commit e72d59a870ab6dea156d4912cbd004b715fca5f7 diff --git a/src/InfoDialog.cpp b/src/InfoDialog.cpp index 23d5b25..fa619e6 100644 --- a/src/InfoDialog.cpp +++ b/src/InfoDialog.cpp @@ -85,12 +85,14 @@ SeqInfoDialog::SeqInfoDialog(SeqGlob * glob, CptNotify *parent) : mLblDescription->setFont(Font(14.0f, Font::plain)); mLblDescription->setMultiLine(true); mLblDescription->setReadOnly(true); - String desc("Build time: "); + String desc; + desc += SeqImageX::infobox_txt; + desc += "\n\nBuild Time: "; desc += Stochas::Build::BuildDate; desc += " "; desc += Stochas::Build::BuildTime; - desc += "\n\n"; - desc += SeqImageX::infobox_txt; + desc += "\nJUCE Version: "; + desc += String(JUCE_MAJOR_VERSION) + "." + String(JUCE_MINOR_VERSION) + "." + String(JUCE_BUILDNUMBER); mLblDescription->setText(desc, false); //mLblDescription->setJustificationType(/*Justification::horizontallyJustified | */ Justification::top);