Merge pull request #324 from StoneyDSP/preview

Preview
StoneyDSP · Dec 30, 2024 · 5bc8cc9 · 5bc8cc9
2 parents abbca60 + 04e1747
commit 5bc8cc9
Show file tree

Hide file tree

Showing 34 changed files with 1,671 additions and 1,707 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,6 +5,7 @@
       "name": "Rack",
       "type": "cppdbg",
       "request": "launch",
+      "preLaunchTask": "make install",
       "targetArchitecture": "x64",
       "program": "${env:HOME}/Downloads/Rack2Free/Rack",
       "cwd": "${env:HOME}/Downloads/Rack2Free",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -58,6 +58,7 @@
     "${workspaceFolder}/include"
   ],
   "C_Cpp.default.defines": [
+    "_DEBUG=1",
     // "STONEYVCV_EXPERIMENTAL",
     "STONEYVCV_BUILD_PLUGIN=1",
     "STONEYVCV_BUILD_MODULES=1",
@@ -78,6 +79,10 @@
   "C_Cpp.default.mergeConfigurations": true,
   "C_Cpp.default.cStandard": "c11",
   "C_Cpp.default.cppStandard": "c++11",
+  "C_Cpp.clang_format_style": "GNU",
+  "C_Cpp.clang_format_fallbackStyle": "GNU",
+  "C_Cpp.codeAnalysis.clangTidy.enabled": false,
+  "C_Cpp.formatting": "vcFormat",
   "C_Cpp.vcpkg.enabled": false,
   "C_Cpp.files.exclude": {
     "**/.github": true,
@@ -86,7 +91,6 @@
     "**/docs": true,
     "**/share": true,
     "**/install": true,
-    "**/build": true,
     "**/dist": true,
     "**/bin": true
   },

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,6 +1,104 @@
 {
   "version": "2.0.0",
   "tasks": [
+    {
+      "type": "shell",
+      "label": "make",
+      "command": "make",
+      "args": [],
+      "options": {
+        "env": {
+          // "VERBOSE": "1",
+          "DEBUG": "1"
+        }
+      },
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "dependsOn": [
+        "cmake preset"
+      ]
+    },
+    {
+      "type": "shell",
+      "label": "make dist",
+      "command": "make",
+      "args": [
+        "dist"
+      ],
+      "options": {
+        "env": {
+          // "VERBOSE": "1",
+          "DEBUG": "1"
+        }
+      },
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "dependsOn": [
+        "cmake preset"
+      ]
+    },
+    {
+      "type": "shell",
+      "label": "make install",
+      "command": "make",
+      "args": [
+        "install"
+      ],
+      "options": {
+        "env": {
+          // "VERBOSE": "1",
+          "DEBUG": "1"
+        }
+      },
+      "problemMatcher": [
+        "$gcc"
+      ],
+      "dependsOn": [
+        "cmake preset"
+      ]
+    },
+    {
+      "type": "shell",
+      "label": "make workflow",
+      "command": "make",
+      "args": [
+        "workflow"
+      ],
+      "options": {
+        "env": {
+          // "VERBOSE": "1",
+          "DEBUG": "1"
+        }
+      },
+      "problemMatcher": [
+        "$gcc"
+      ]
+    },
+    {
+      "type": "shell",
+      "command": "cmake",
+      "label": "cmake preset",
+      "linux": {
+        "args": [
+          "--preset x64-linux-debug"
+        ]
+      },
+      "windows": {
+        "args": [
+          "--preset x64-windows-debug"
+        ]
+      },
+      "osx": {
+        "args": [
+          "--preset x64-osx-debug"
+        ]
+      },
+      "problemMatcher": [
+        "$gcc"
+      ]
+    },
     {
       "type": "cmake",
       "label": "CMake: build",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -240,7 +240,7 @@ if(STONEYVCV_BUILD_PLUGIN)
     )
 
     list(APPEND STONEYVCV_TARGETS plugin) # Collect list of targets to build...
-    message(STATUS "Added target: ${STONEYVCV_SLUG}::${STONEYVCV_BRAND}::plugin v${plugin_VERSION}")
+    message(STATUS "Added target: ${STONEYVCV_BRAND}::${STONEYVCV_SLUG}::plugin v${plugin_VERSION}")
 
 endif(STONEYVCV_BUILD_PLUGIN)
 
@@ -284,7 +284,7 @@ function(stoneyvcv_add_test MODULE)
     )
     target_compile_features(tests_${MODULE} PUBLIC cxx_std_17)
     target_compile_features(tests_${MODULE} PUBLIC c_std_17)
-    message(STATUS "Added target: ${STONEYVCV_SLUG}::${STONEYVCV_BRAND}::tests_${MODULE} v${tests_${MODULE}_VERSION}")
+    message(STATUS "Added target: ${STONEYVCV_BRAND}::${STONEYVCV_SLUG}::tests_${MODULE} v${tests_${MODULE}_VERSION}")
 endfunction()
 
 if(STONEYVCV_IS_TOP_LEVEL AND STONEYVCV_BUILD_TESTS)
@@ -304,6 +304,18 @@ if(STONEYVCV_IS_TOP_LEVEL AND STONEYVCV_BUILD_TESTS)
         $<BUILD_INTERFACE:${STONEYVCV_BINARY_DIR}/include>
         $<INSTALL_INTERFACE:include>
     )
+    configure_file("test/${STONEYVCV_SLUG}/test.hpp" "test/${STONEYVCV_SLUG}/test.hpp")
+    target_sources(tests
+        PUBLIC
+        FILE_SET stoneyvcv_TESTS_PUBLIC_HEADERS
+        TYPE HEADERS
+        BASE_DIRS
+        $<BUILD_INTERFACE:${STONEYVCV_BINARY_DIR}/test>
+        $<INSTALL_INTERFACE:test>
+        FILES
+        $<BUILD_INTERFACE:${STONEYVCV_BINARY_DIR}/test/${STONEYVCV_SLUG}/test.hpp>
+        $<INSTALL_INTERFACE:test/${STONEYVCV_SLUG}/test.hpp>
+    )
     target_link_libraries(tests
         PUBLIC
         unofficial-vcvrack::rack-sdk::lib
@@ -399,7 +411,7 @@ if(STONEYVCV_BUILD_MODULES)
             )
 
             list(APPEND STONEYVCV_TARGETS ${MODULE}) # Collect enabled modules
-            message(STATUS "Added target: ${STONEYVCV_SLUG}::${STONEYVCV_BRAND}::${MODULE} v${${MODULE}_VERSION}")
+            message(STATUS "Added target: ${STONEYVCV_BRAND}::${STONEYVCV_SLUG}::${MODULE} v${${MODULE}_VERSION}")
 
         endif()
 

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -37,7 +37,7 @@
       },
       "environment": {
         "ARCH_NAME": "$env{ARCH_OS}-$env{ARCH_CPU}",
-        "PLUGINS_DIR": "$env{RACK_USER_DIR}/plugins-$env{ARCH_OS}-$env{ARCH_CPU}",
+        "PLUGINS_DIR": "$env{RACK_USER_DIR}/plugins-$env{ARCH_NAME}",
         "VCPKG_ROOT": "$penv{VCPKG_ROOT}",
         "VCPKG_OVERLAY_PORTS": "${sourceDir}/dep/vcpkg-registry/ports",
         "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/dep/vcpkg-registry/triplets"

diff --git a/Makefile b/Makefile
@@ -202,10 +202,12 @@ endif
 
 # The macro NDEBUG controls whether assert() statements are active or not.
 ifdef DEBUG
-	CFLAGS += -Wall
-	CFLAGS += -Wextra
-	CFLAGS += -DNDEBUG
-	CFLAGS += -D_DEBUG
+	# FLAGS += -Wall
+	# FLAGS += -Wextra
+	# FLAGS += -DDEBUG
+	FLAGS += -D_DEBUG
+else
+	FLAGS += -DNDEBUG
 endif
 
 ifdef VERBOSE
@@ -215,15 +217,15 @@ endif
 EXTERNAL_DEPS :=
 EXTERNAL_DEPS += StoneyDSP
 EXTERNAL_DEPS += Rack-SDK
-EXTERNAL_DEPS += catch2
+# EXTERNAL_DEPS += catch2
 
 PKG_CONFIG_PATH := $(PWD)/build/vcpkg_installed/$(TRIPLET_ARCH)-$(TRIPLET_OS)/lib/pkgconfig:$(PKG_CONFIG_PATH)
 
 FLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(EXTERNAL_DEPS))
 LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs $(EXTERNAL_DEPS))
 
 # FLAGS will be passed to both the C and C++ compiler
-FLAGS += -I$(PWD)/include
+FLAGS += -I$(PWD)/build/include
 CFLAGS +=
 CXXFLAGS +=
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.1032.36333431353238
+2.0.1129.39313766316333