From ee5dc2ada3039a0eb2c26d02efab14eb70708c0f Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Mon, 18 Sep 2023 14:59:21 +0200 Subject: [PATCH] Build with JUCE 7.0.6 --- CMakeLists.txt | 46 +++++++++++++++++++-------------------- deps/clap-juce-extensions | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1533bab..a806ac7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # information can be found in the CMake docs. cmake_minimum_required(VERSION 3.15) - +set (CMAKE_CXX_STANDARD 20) if (WIN32) #set (CMAKE_GENERATOR_TOOLSET ClangCL) @@ -22,7 +22,7 @@ if (APPLE) set (CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE INTERNAL "") if (UniversalBinary) set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE INTERNAL "") - #set(CMAKE_OSX_ARCHITECTURES arm64 x86_64) + #set(CMAKE_OSX_ARCHITECTURES arm64 x86_64) endif() endif() @@ -54,7 +54,7 @@ set(BUILDVERSION 112) set(CMAKE_XCODE_GENERATE_SCHEME OFF) # No ZERO_CHECK target (it helps bust cache for cmake) -set(CMAKE_SUPPRESS_REGENERATION true) +set(CMAKE_SUPPRESS_REGENERATION true) # prevent install all #set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) @@ -99,7 +99,7 @@ endif() if (AAX_SDK_PATH) juce_set_aax_sdk_path (${AAX_SDK_PATH}) - + if (APPLE OR (NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))) list (APPEND AaxFormatsToBuild AAX) endif() @@ -142,7 +142,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr set (vst3cats Instrument Network) set (vst2cat "kPlugCategSynth") else() - set (vst3cats Fx Network) + set (vst3cats Fx Network) set (vst2cat "kPlugCategEffect") endif() @@ -154,7 +154,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr COMPANY_NAME "Sonosaurus" BUNDLE_ID "com.sonosaurus.paulxstretch" MICROPHONE_PERMISSION_ENABLED TRUE - + ICON_BIG "images/paulxstretch_icon_1024_rounded.png" ICON_SMALL "images/paulxstretch_icon_256_rounded.png" NEEDS_WEB_BROWSER FALSE @@ -162,15 +162,15 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr VST3_CATEGORIES "${vst3cats}" AAX_CATEGORY "AAX_EPlugInCategory_Effect" - + # mac settings HARDENED_RUNTIME_ENABLED TRUE HARDENED_RUNTIME_OPTIONS "com.apple.security.device.audio-input" PLIST_TO_MERGE "${MacPList}" AU_MAIN_TYPE "kAudioUnitType_MusicEffect" - + COPY_PLUGIN_AFTER_BUILD FALSE # Set to TRUE to auto-install - + # other settings... PLUGIN_MANUFACTURER_CODE Sono PLUGIN_CODE ${plugincode} @@ -337,8 +337,8 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr Source/pffft/pffft.c ) - target_sources("${target_name}" PRIVATE - ${SourceFiles} + target_sources("${target_name}" PRIVATE + ${SourceFiles} ) # No, we don't want our source buried in extra nested folders @@ -355,7 +355,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr # INTERFACE # $) - + target_include_directories("${target_name}" PUBLIC @@ -365,7 +365,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr # Require at least C++17 to build `my_target` target_compile_features("${target_name}" PRIVATE cxx_std_17) - + # This cleans up the folder organization, especially on Xcode. # It tucks the Plugin varieties into a "Targets" folder and generate an Xcode Scheme manually @@ -378,17 +378,17 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr set_target_properties(${target_name}_${target} PROPERTIES # Tuck the actual plugin targets into a folder where they won't bother us FOLDER "Targets" - + # MacOS only: Sets the default executable that Xcode will open on build - # For this exact path to to work, manually build the AudioPluginHost.xcodeproj in the JUCE subdir + # For this exact path to to work, manually build the AudioPluginHost.xcodeproj in the JUCE subdir # XCODE_SCHEME_EXECUTABLE "${CMAKE_CURRENT_SOURCE_DIR}/deps/juce/extras/AudioPluginHost/Builds/MacOSX/build/Debug/AudioPluginHost.app" - - # Let us build the target in Xcode + + # Let us build the target in Xcode XCODE_GENERATE_SCHEME ON) endif() endforeach() - - + + target_compile_definitions("${target_name}" PUBLIC JUCE_WEB_BROWSER=0 @@ -447,7 +447,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr -march=native ) endif() - + if (TARGET ${target_name}_Standalone) # make linux executable all lower case string(TOLOWER ${target_name} tmptargname) @@ -465,13 +465,13 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr ${LIB_PATHS} ) - target_link_libraries("${target_name}" + target_link_libraries("${target_name}" PRIVATE juce::juce_audio_utils juce::juce_dsp juce::juce_audio_plugin_client juce::juce_cryptography - + ${target_name}_PSData ${FFTW_DEPLIBS} @@ -481,7 +481,7 @@ function(sono_add_custom_plugin_target target_name product_name formats is_instr juce::juce_recommended_lto_flags # juce::juce_recommended_warning_flags ) - + endfunction() # most of the targets diff --git a/deps/clap-juce-extensions b/deps/clap-juce-extensions index a4265bc..10bc7d4 160000 --- a/deps/clap-juce-extensions +++ b/deps/clap-juce-extensions @@ -1 +1 @@ -Subproject commit a4265bcc85488292504b6a298a4e243e688316fb +Subproject commit 10bc7d4ddb82eab4796b1ce7d1d2dadd46552f27