From d746188616fcfef4d5c9cf8512a9c7795292363f Mon Sep 17 00:00:00 2001 From: washikano Date: Fri, 26 Apr 2024 23:42:10 -0600 Subject: [PATCH] Change build rules for LOGinstruments, removed kiss_fft from plugins.cpp --- plugins/Makefile | 3 ++- plugins/plugins.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 330763f..4e9caad 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -852,6 +852,7 @@ LITTLEUTILS_CUSTOM = MsDisplayWidget # LOGinstruments PLUGIN_FILES += $(filter-out LOGinstruments/src/LOGinstruments.cpp,$(wildcard LOGinstruments/src/*.cpp)) +PLUGIN_FILES += LOGinstruments/src/kiss_fft.c # -------------------------------------------------------------- # LomasModules @@ -2513,7 +2514,7 @@ $(BUILD_DIR)/LittleUtils/%.cpp.o: LittleUtils/%.cpp $(foreach m,$(LITTLEUTILS_CUSTOM),$(call custom_module_names,$(m),LittleUtils)) \ -DpluginInstance=pluginInstance__LittleUtils -$(BUILD_DIR)/LOGinstruments/src/%.cpp.o: LOGinstruments/src/%.cpp +$(BUILD_DIR)/LOGinstruments/src/%.o: LOGinstruments/src/% -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index b33b44d..a52ff57 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -588,7 +588,6 @@ extern Model* modelLooperOne; extern Model* modelLooperTwo; // LOGinstruments -#include "LOGinstruments/src/kiss_fft.c" #include "LOGinstruments/src/LOGinstruments.hpp" // LomasModules