From 25d70077dcdc91b2abba206a066b36520a8b4e8f Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 23 Dec 2024 08:16:45 -0500 Subject: [PATCH] Get pipeline running on other oses (#2) Pipeline runs on other uses --- .github/workflows/build-plugin.yml | 36 ++++++++++++-------------- CMakeLists.txt | 10 ++++++- doc/design.md | 4 ++- src/clap/six-sines-clap-entry-impl.cpp | 2 ++ src/dsp/node_support.h | 3 +++ 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index e7bf667..202c552 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -31,16 +31,12 @@ jobs: name: windows-x64 cmake_args: -G"Visual Studio 17 2022" -A x64 - #- os: windows-latest - # name: windows-arm64ec - # cmake_args: -G"Visual Studio 17 2022" -A arm64ec -DAWCO_ARM64EC=TRUE -DCMAKE_SYSTEM_VERSION=10 + - os: macos-latest + name: macos + cmake_args: -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" - #- os: macos-latest - # name: macos - # cmake_args: -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" - - #- os: ubuntu-latest - # name: linux-x64 + - os: ubuntu-latest + name: linux-x64 steps: - name: Checkout code @@ -78,11 +74,18 @@ jobs: #export MAC_SIGNING_TEAM="${{ secrets.MAC_SIGNING_TEAM }}" cmake -S . -B ./build ${{ matrix.cmake_args }} -DCMAKE_BUILD_TYPE=Release - cmake --build ./build --config Release --target six-sines_standalone six-sines_clap --parallel 3 + cmake --build ./build --config Release --target six-sines_all --parallel 3 + + - name: Make windows zie + if: github.event_name != 'pull_request' && runner.os == 'Windows' + run: | mkdir build/inst mkdir build/insttmp mv build/CLAP/Release/*.clap build/insttmp mv build/Release/*.exe build/insttmp + + ls -lR ./build/inst + 7z a -r build/inst/windows-`git rev-parse --short HEAD`-nightly.zip build/insttmp/* - name: Configure pull request version @@ -93,20 +96,15 @@ jobs: - name: Build pull request version if: github.event_name == 'pull_request' run: | - cmake --build ./build --config Debug --target six-sines_standalone six-sines_clap --parallel 3 - mkdir build/inst - mkdir build/insttmp - mv build/CLAP/Debug/*.clap build/insttmp - mv build/Debug/*.exe build/insttmp - 7z a -r build/inst/windows-`git rev-parse --short HEAD`-nightly.zip build/insttmp/* - + cmake --build ./build --config Debug --target six-sines_all --parallel 3 - - name: Show Build Directory + - name: Find all the six sines run: | - ls -lR ./build/inst + find build -name "Six Sines*" -print - name: Upload artifact uses: actions/upload-artifact@v4 + if: runner.os == 'Windows' with: path: build/inst name: dawplugin-${{ matrix.name }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 650d7b2..8123a4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,5 +138,13 @@ target_add_standalone_wrapper(TARGET ${sat} STATICALLY_LINKED_CLAP_ENTRY True PLUGIN_ID "org.baconpaul.six-sines") - +add_custom_target(${PROJECT_NAME}_all) +add_dependencies(${PROJECT_NAME}_all + ${PROJECT_NAME}_clap + ${PROJECT_NAME}_standalone + ${PROJECT_NAME}_vst3 +) +if (APPLE) + add_dependencies(${PROJECT_NAME}_all ${PROJECT_NAME}_auv2) +endif() diff --git a/doc/design.md b/doc/design.md index ec2c773..a5602a1 100644 --- a/doc/design.md +++ b/doc/design.md @@ -26,8 +26,10 @@ Macros and MIDI Other ToDos - Envelope Rate Linear to 2x provider - General UI -- Voice Manager has Mono and Mono Legato mode - turn them on? - Interpolate ratio across the block in source +- Max voice count +- Portamento +- Patch to XML Installer - mac signing diff --git a/src/clap/six-sines-clap-entry-impl.cpp b/src/clap/six-sines-clap-entry-impl.cpp index fd0c723..8bdacf1 100644 --- a/src/clap/six-sines-clap-entry-impl.cpp +++ b/src/clap/six-sines-clap-entry-impl.cpp @@ -20,6 +20,8 @@ #include "clapwrapper/auv2.h" #include +#include +#include #include namespace baconpaul::six_sines diff --git a/src/dsp/node_support.h b/src/dsp/node_support.h index 6e32f5f..9d19aee 100644 --- a/src/dsp/node_support.h +++ b/src/dsp/node_support.h @@ -16,6 +16,9 @@ #ifndef BACONPAUL_SIX_SINES_DSP_NODE_SUPPORT_H #define BACONPAUL_SIX_SINES_DSP_NODE_SUPPORT_H +#include +#include + #include "sst/basic-blocks/modulators/DAHDSREnvelope.h" #include "sst/basic-blocks/modulators/SimpleLFO.h"