Skip to content

Commit

Permalink
Some tweaks on submodules, arm builds, etc (#1440)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
baconpaul authored Oct 31, 2024
1 parent 7943fa7 commit 3f5db41
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion clients/clap-first/scxt-plugin/scxt-plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion libs/clap/clap-wrapper

0 comments on commit 3f5db41

Please sign in to comment.