Merge pull request #405 from StoneyDSP/development

merge development

Author: nathanjhood

.github/workflows/macos-latest.yml

@@ -38,7 +38,7 @@ jobs:
       # https://vcvrack.com/manual/Building#Setting-up-your-development-environment
     - name: Install VCV's macOS Deps
       run: |
-        brew install git wget cmake autoconf automake libtool jq python zstd pkg-config sccache ninja tree
+        brew install coreutils git wget cmake autoconf automake libtool jq python zstd pkg-config sccache ninja tree
 
     - name: checkout StoneyVCV
       uses: actions/checkout@v4

.github/workflows/static.yml

@@ -53,7 +53,7 @@ jobs:
 
       - name: Install VCV's Linux Deps
         run: |
-          sudo apt-get update && sudo apt install make doxygen ninja-build cmake graphviz
+          sudo apt-get update && sudo apt install coreutils make doxygen ninja-build cmake graphviz
 
       - name: get Rack Executable
         shell: bash

.github/workflows/ubuntu-latest.yml

@@ -40,7 +40,7 @@ jobs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt install unzip git gdb curl cmake libx11-dev libglu1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev zlib1g-dev libasound2-dev libgtk2.0-dev libgtk-3-dev libjack-jackd2-dev jq zstd libpulse-dev pkg-config ninja-build ccache tree
+        sudo apt install coreutils unzip git gdb curl cmake libx11-dev libglu1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev zlib1g-dev libasound2-dev libgtk2.0-dev libgtk-3-dev libjack-jackd2-dev jq zstd libpulse-dev pkg-config ninja-build ccache tree
 
     - name: checkout StoneyVCV
       uses: actions/checkout@v4

.github/workflows/windows-latest.yml

@@ -52,6 +52,7 @@ jobs:
         install: >-
           --needed
           base-devel
+          coreutils
           git
           curl
           wget

.vscode/settings.json

@@ -8,7 +8,10 @@
     80,
     160
   ],
-  "makefile.configureOnOpen": false,
+  "makefile.configureOnOpen": true,
+  "makefile.compileCommandsPath": "${workspaceFolder}/build/compile_commands_make.json",
+  "makefile.makefilePath": "${workspaceFolder}/Makefile",
+  "makefile.makePath": "make",
   "cmake.cmakePath": "cmake",
   "cmake.ctestPath": "ctest",
   "cmake.cpackPath": "cpack",
@@ -60,6 +63,7 @@
   "C_Cpp.default.defines": [
     "_DEBUG=1",
     "STONEYVCV_EXPERIMENTAL",
+    "STONEYVCV_BUILD_COMPONENTLIBRARY=1",
     "STONEYVCV_BUILD_PLUGIN=1",
     "STONEYVCV_BUILD_MODULES=1",
     "STONEYVCV_BUILD_HP4=1",

CMakeLists.txt

@@ -23,6 +23,10 @@
           "value": "ON",
           "type": "BOOL"
         },
+        "STONEYVCV_BUILD_COMPONENTLIBRARY": {
+          "value": "ON",
+          "type": "BOOL"
+        },
         "STONEYVCV_BUILD_PLUGIN": {
           "value": "ON",
           "type": "BOOL"

CMakeOptions.json

@@ -108,10 +108,14 @@ FLAGS += -DSTONEYVCV_VERSION_MAJOR=$(STONEYVCV_VERSION_MAJOR)
 FLAGS += -DSTONEYVCV_VERSION_MINOR=$(STONEYVCV_VERSION_MINOR)
 FLAGS += -DSTONEYVCV_VERSION_PATCH=$(STONEYVCV_VERSION_PATCH)
 FLAGS += -DSTONEYVCV_VERSION_TWEAK=$(STONEYVCV_VERSION_TWEAK)
+FLAGS += -DSTONEYVCV_VERSION=$(STONEYVCV_VERSION)
 
 # Experimental?
 STONEYVCV_EXPERIMENTAL ?= 0
 
+# Component Library?
+STONEYVCV_BUILD_COMPONENTLIBRARY ?= 1
+
 # Build plugin?
 STONEYVCV_BUILD_PLUGIN ?= 1
 
@@ -123,10 +127,28 @@ STONEYVCV_BUILD_HP1 ?= $(STONEYVCV_BUILD_MODULES)
 STONEYVCV_BUILD_VCA ?= $(STONEYVCV_BUILD_MODULES)
 STONEYVCV_BUILD_LFO ?= $(STONEYVCV_EXPERIMENTAL)
 
+# ifneq ($(STONEYVCV_BUILD_COMPONENTLIBRARY),$(STONEYVCV_BUILD_PLUGIN))
+# $(error STONEYVCV_BUILD_PLUGIN requires that STONEYVCV_BUILD_COMPONENTLIBRARY=1)
+# endif
+
+SOURCES += src/StoneyVCV.cpp
+
+ifeq ($(STONEYVCV_EXPERIMENTAL),1)
+	FLAGS += -DSTONEYVCV_EXPERIMENTAL=$(STONEYVCV_EXPERIMENTAL)
+endif
+
+ifeq ($(STONEYVCV_BUILD_COMPONENTLIBRARY),1)
+	FLAGS += -DSTONEYVCV_BUILD_COMPONENTLIBRARY=$(STONEYVCV_BUILD_COMPONENTLIBRARY)
+	SOURCES += src/StoneyVCV/ComponentLibrary.cpp
+	SOURCES += src/StoneyVCV/ComponentLibrary/Widget.cpp
+	SOURCES += src/StoneyVCV/ComponentLibrary/PortWidget.cpp
+	SOURCES += src/StoneyVCV/ComponentLibrary/ParamWidget.cpp
+	SOURCES += src/StoneyVCV/ComponentLibrary/PanelWidget.cpp
+endif
+
 ifeq ($(STONEYVCV_BUILD_PLUGIN),1)
 	FLAGS += -DSTONEYVCV_BUILD_PLUGIN=$(STONEYVCV_BUILD_PLUGIN)
 	SOURCES += src/StoneyVCV/plugin.cpp
-	SOURCES += src/StoneyVCV/ComponentLibrary.cpp
 
 	ifeq ($(STONEYVCV_BUILD_MODULES),1)
 		FLAGS += -DSTONEYVCV_BUILD_MODULES=$(STONEYVCV_BUILD_MODULES)
@@ -217,7 +239,7 @@ endif
 
 EXTERNAL_DEPS :=
 EXTERNAL_DEPS += StoneyDSP
-EXTERNAL_DEPS += Rack-SDK
+# EXTERNAL_DEPS += Rack-SDK
 # EXTERNAL_DEPS += catch2
 
 PKG_CONFIG_PATH := $(PWD)/build/vcpkg_installed/$(TRIPLET_ARCH)-$(TRIPLET_OS)/lib/pkgconfig:$(PKG_CONFIG_PATH)

Makefile

@@ -2,14 +2,8 @@
 
 StoneyDSP modules for [VCV Rack 2](https://vcvrack.com/).
 
-[![HP1](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP1-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP1.html#gh-light-mode-only)
-[![HP1](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP1-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP1.html#gh-dark-mode-only)
-[![HP2](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP2-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP2.html#gh-light-mode-only)
-[![HP2](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP2-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP2.html#gh-dark-mode-only)
-[![HP4](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP4-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP4.html#gh-light-mode-only)
-[![HP4](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP4-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP4.html#gh-dark-mode-only)
-[![VCA](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/VCA-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2VCA.html#gh-light-mode-only)
-[![VCA](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/VCA-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2VCA.html#gh-dark-mode-only)
+[![Preview](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/images/preview-light.png)](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/images/preview-light.png#gh-light-mode-only)
+[![Preview](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/images/preview-dark.png)](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/images/preview-dark.png#gh-dark-mode-only)
 
 ---
 [![windows](https://github.com/StoneyDSP/StoneyVCV/actions/workflows/windows-latest.yml/badge.svg)](https://github.com/StoneyDSP/StoneyVCV/actions/workflows/windows-latest.yml)
@@ -52,6 +46,17 @@ make install
 
 ---
 
+[![HP1](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP1-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP1.html#gh-light-mode-only)
+[![HP1](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP1-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP1.html#gh-dark-mode-only)
+[![HP2](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP2-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP2.html#gh-light-mode-only)
+[![HP2](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP2-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP2.html#gh-dark-mode-only)
+[![HP4](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP4-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP4.html#gh-light-mode-only)
+[![HP4](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/HP4-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2HP4.html#gh-dark-mode-only)
+[![VCA](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/VCA-light.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2VCA.html#gh-light-mode-only)
+[![VCA](https://raw.githubusercontent.com/StoneyDSP/StoneyVCV/refs/heads/production/res/specs/VCA-dark.svg)](https://stoneydsp.github.io/StoneyVCV/md_docs_2VCA.html#gh-dark-mode-only)
+
+---
+
 ## Requirements
 
 Complete the [Setting up your development environment](https://vcvrack.com/manual/Building#Setting-up-your-development-environment) section of the [VCV Rack Plugin Development guide](https://vcvrack.com/manual/Building). Briefly, you will need the following installations at minimum:

README.md

@@ -1 +1 @@
-2.0.1197.64336465306163
+2.0.1349.34376333316466