From d2b82187d9d9cc6891563d0647a7703301d2914e Mon Sep 17 00:00:00 2001 From: yoshih Date: Tue, 17 Dec 2024 16:49:56 +0800 Subject: [PATCH 1/3] upgrade juce to build on osx15 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f71bebc..7d81fb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(sst-jucegui VERSION 0.5 LANGUAGES C CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -option(SST_JUCEGUI_BUILD_EXAMPLES "Add targets for building and running sst-filters examples" FALSE) +option(SST_JUCEGUI_BUILD_EXAMPLES "Add targets for building and running sst-filters examples" TRUE) if (${SST_JUCEGUI_BUILD_EXAMPLES}) if (${PROJECT_IS_TOP_LEVEL}) @@ -26,7 +26,7 @@ if (${SST_JUCEGUI_BUILD_EXAMPLES}) if (NOT TARGET juce::juce_gui_basics) if (NOT DEFINED SST_JUCEGUI_JUCE_VERSION) - set(SST_JUCEGUI_JUCE_VERSION 7.0.12) + set(SST_JUCEGUI_JUCE_VERSION 8.0.4) endif() message(STATUS "Downloading JUCE ${SST_JUCEGUI_JUCE_VERSION}") set(FETCHCONTENT_QUIET FALSE) From 81b68b6ecd734dfa22ad22d2cf475bd6a33cf42c Mon Sep 17 00:00:00 2001 From: yoshih Date: Tue, 17 Dec 2024 17:02:03 +0800 Subject: [PATCH 2/3] conditional sound flags --- CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d81fb8..d0dca56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,8 @@ project(sst-jucegui VERSION 0.5 LANGUAGES C CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -option(SST_JUCEGUI_BUILD_EXAMPLES "Add targets for building and running sst-filters examples" TRUE) +option(SST_JUCEGUI_BUILD_EXAMPLES "Add targets for building and running sst-filters examples" FALSE) +option(SST_JUCEGUI_SKIP_AUDIO "Skip JUCE audio definitions" TRUE) if (${SST_JUCEGUI_BUILD_EXAMPLES}) if (${PROJECT_IS_TOP_LEVEL}) @@ -128,13 +129,23 @@ else() else() add_library(sst-jucegui-juce-requirements INTERFACE) target_link_libraries(sst-jucegui-juce-requirements INTERFACE juce::juce_gui_basics) + target_compile_definitions(sst-jucegui-juce-requirements INTERFACE - JUCE_USE_CURL=0 - JUCE_WEB_BROWSER=0 + JUCE_USE_CURL=0 + JUCE_WEB_BROWSER=0 + ) + + if(NOT ${SST_JUCEGUI_SKIP_AUDIO}) + target_compile_definitions(sst-jucegui-juce-requirements INTERFACE JUCE_JACK=0 JUCE_ALSA=0 JUCE_WASAPI=0 - JUCE_DIRECTSOUND=0) + JUCE_DIRECTSOUND=0 + ) + else() + message(STATUS "SST_JUCEGUI_SKIP_AUDIO is set to FALSE. Audio flags are skipped.") + endif() + endif() endif() From b0a7e157a591663c6760c52d7443ef5cf75529c6 Mon Sep 17 00:00:00 2001 From: yoshih Date: Tue, 17 Dec 2024 17:07:16 +0800 Subject: [PATCH 3/3] change msg --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0dca56..6fd4b1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ else() JUCE_DIRECTSOUND=0 ) else() - message(STATUS "SST_JUCEGUI_SKIP_AUDIO is set to FALSE. Audio flags are skipped.") + message(STATUS "SST_JUCEGUI_SKIP_AUDIO is set to TRUE. Audio flags are skipped.") endif() endif()