Browse Source

Update ZZC (#906)

* Update ZZC

* Fix C++ One Definition Error

* Fix more "C++ One Definition Error"'s

* Fix more "C++ One Definition Error"'s
tags/26.02
rl2939 GitHub 6 days ago
parent
commit
46525adee6
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
  1. +4
    -1
      plugins/Makefile
  2. +1
    -1
      plugins/ZZC
  3. +3
    -0
      plugins/plugins.cpp

+ 4
- 1
plugins/Makefile View File

@@ -1347,11 +1347,13 @@ PLUGIN_FILES += $(filter-out ZetaCarinaeModules/src/plugin.cpp,$(wildcard ZetaCa
# ZZC

PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp ZZC/src/WavetablePlayer.cpp,$(wildcard ZZC/src/*.cpp))
PLUGIN_FILES += $(wildcard ZZC/src/Phaseque/*.cpp)
# PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp
# PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp

# modules/types which are present in other plugins
ZZC_CUSTOM = Clock LowFrequencyOscillator
ZZC_CUSTOM = Clock LowFrequencyOscillator LedLight Step PolyModeValueItem PolyModeItem
ZZC_CUSTOM_PER_FILE = ExternalCVModeCompatibleOptionItem ExternalCVModeVBPSOptionItem SnapCVOptionItem ExternalCVModeItem

# --------------------------------------------------------------
# Build setup
@@ -2875,6 +2877,7 @@ $(BUILD_DIR)/ZZC/%.cpp.o: ZZC/%.cpp
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(ZZC_CUSTOM),$(call custom_module_names,$(m),ZZC)) \
$(foreach m,$(ZZC_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ZZC_$(shell basename -- $*))) \
-DpluginInstance=pluginInstance__ZZC

# --------------------------------------------------------------


+ 1
- 1
plugins/ZZC

@@ -1 +1 @@
Subproject commit f5900888025fcfad7842770e83365ba743bb51bd
Subproject commit 5a9d37487026133e54b1af3004851fb8362a3d52

+ 3
- 0
plugins/plugins.cpp View File

@@ -932,8 +932,10 @@ void setupSamples();
#define ZZC_SHARED_H
#define ZZC_WIDGETS_H
#define modelClock modelZZCClock
#define LedLight ZZCLedLight
#include "ZZC/src/ZZC.hpp"
#undef modelClock
#undef LedLight

// known terminal modules
std::vector<Model*> hostTerminalModels;
@@ -3705,6 +3707,7 @@ static void initStatic__ZZC()
p->addModel(modelDiv);
p->addModel(modelDivExp);
p->addModel(modelPolygate);
p->addModel(modelPhaseque);
#undef modelClock
}
}


Loading…
Cancel
Save