From 8912c90430d7adf99734047092121cf0129e618f Mon Sep 17 00:00:00 2001 From: yoshih Date: Tue, 17 Dec 2024 21:12:51 +0800 Subject: [PATCH] Integrate sst-jucegui as a dependency (#7924) * submodule the thingy * locally it works * add the line back in * skip library if juce is skipped * update sst-jucegui submodule --- .gitmodules | 3 +++ libs/sst/sst-jucegui | 1 + src/common/CMakeLists.txt | 2 ++ src/surge-fx/CMakeLists.txt | 1 + 4 files changed, 7 insertions(+) create mode 160000 libs/sst/sst-jucegui diff --git a/.gitmodules b/.gitmodules index 06f9b1c40b8..013002444d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,3 +56,6 @@ [submodule "libs/luajitlib/cmake"] path = libs/luajitlib/cmake url = https://github.com/scikit-build/cmake-FindVcvars +[submodule "libs/sst/sst-jucegui"] + path = libs/sst/sst-jucegui + url = git@github.com:surge-synthesizer/sst-jucegui.git diff --git a/libs/sst/sst-jucegui b/libs/sst/sst-jucegui new file mode 160000 index 00000000000..96985a5d10c --- /dev/null +++ b/libs/sst/sst-jucegui @@ -0,0 +1 @@ +Subproject commit 96985a5d10cae91c1a008b50f74510ab39624c6d diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index b10a2a19837..f03f459d6df 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -33,6 +33,7 @@ surge_add_lib_subdirectory(sst/sst-cpputils) surge_add_lib_subdirectory(sst/sst-plugininfra) surge_add_lib_subdirectory(sst/sst-filters) surge_add_lib_subdirectory(sst/sst-waveshapers) + target_compile_definitions(sst-waveshapers INTERFACE SURGE_XT_1X_WST=1) surge_add_lib_subdirectory(sst/sst-effects) @@ -41,6 +42,7 @@ set(PEGTL_BUILD_EXAMPLES OFF CACHE BOOL "") surge_add_lib_subdirectory(PEGTL) if(NOT SURGE_SKIP_JUCE_FOR_RACK) + surge_add_lib_subdirectory(sst/sst-jucegui) juce_add_binary_data(surge-common-binary NAMESPACE SurgeSharedBinary HEADER_NAME SurgeSharedBinary.h diff --git a/src/surge-fx/CMakeLists.txt b/src/surge-fx/CMakeLists.txt index ff9c96aeb6e..105fdb6dda9 100644 --- a/src/surge-fx/CMakeLists.txt +++ b/src/surge-fx/CMakeLists.txt @@ -68,6 +68,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE surge::surge-common surge-fx-binary surge-juce + sst-jucegui juce::juce_audio_utils juce::juce_audio_processors juce::juce_osc