From 3f5db41251d22e0735b559e8a260a02750f41187 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 31 Oct 2024 11:04:15 -0400 Subject: [PATCH] Some tweaks on submodules, arm builds, etc (#1440) 1. clap-wrapper and sst-plugininfra go to head 2. MSVC builds go to unity builds for timeliness 3. Add "Free and Open Source" to the clap tag --- .github/workflows/build-pr.yml | 4 ++-- .github/workflows/build-release.yml | 2 +- clients/clap-first/scxt-plugin/scxt-plugin.cpp | 3 ++- libs/clap/clap-wrapper | 2 +- libs/sst/sst-plugininfra | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 62d986cc..09199d89 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -16,7 +16,7 @@ jobs: - name: "windows msvc" os: windows-latest target: shortcircuit-products - cmakeConfig: -G"Visual Studio 17 2022" -A x64 + cmakeConfig: -G"Visual Studio 17 2022" -A x64 -DCMAKE_UNITY_BUILD=TRUE runTests: false clapValidate: false @@ -30,7 +30,7 @@ jobs: - name: "windows arm64ec" os: windows-latest target: shortcircuit-products - cmakeConfig: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 + cmakeConfig: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 -DCMAKE_UNITY_BUILD=TRUE runTests: false clapValidate: false diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 059e3b23..40fc38ee 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -23,7 +23,7 @@ jobs: - os: windows-latest name: windows-arm64ec - cmakeArgs: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 + cmakeArgs: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 -DCMAKE_UNITY_BUILD=TRUE - os: macos-latest name: macos diff --git a/clients/clap-first/scxt-plugin/scxt-plugin.cpp b/clients/clap-first/scxt-plugin/scxt-plugin.cpp index fc408d48..02abdfce 100644 --- a/clients/clap-first/scxt-plugin/scxt-plugin.cpp +++ b/clients/clap-first/scxt-plugin/scxt-plugin.cpp @@ -37,7 +37,8 @@ namespace scxt::clap_first::scxt_plugin const clap_plugin_descriptor *getDescription() { static const char *features[] = {CLAP_PLUGIN_FEATURE_INSTRUMENT, CLAP_PLUGIN_FEATURE_SAMPLER, - CLAP_PLUGIN_FEATURE_SYNTHESIZER, nullptr}; + CLAP_PLUGIN_FEATURE_SYNTHESIZER, "Free and Open Source", + nullptr}; static clap_plugin_descriptor desc = {CLAP_VERSION, "org.surge-synth-team.shortcircuit-xt", "Shortcircuit XT", diff --git a/libs/clap/clap-wrapper b/libs/clap/clap-wrapper index 0c23f5e3..705df270 160000 --- a/libs/clap/clap-wrapper +++ b/libs/clap/clap-wrapper @@ -1 +1 @@ -Subproject commit 0c23f5e3c798d3944ad3b9dce560df7272df176e +Subproject commit 705df2703fbb991b3609e1a5c91d92a5c2213925 diff --git a/libs/sst/sst-plugininfra b/libs/sst/sst-plugininfra index 77a1d465..4ef3837a 160000 --- a/libs/sst/sst-plugininfra +++ b/libs/sst/sst-plugininfra @@ -1 +1 @@ -Subproject commit 77a1d4651d061e2055e797c29d82e318adc57bf1 +Subproject commit 4ef3837a8dd6e3f2d077b2c278f25e2f4d5f0079