brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to custom juce from carla, update surge

Browse source
This commit is contained in:
falkTX 2023-02-10 22:16:22 +00:00
parent 68c94903e3
commit 0ac2736dfa
7 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
carla

@ -1 +1 @@
Subproject commit aa400535b31c67f4b6c1b28e6e20e4d4f82111a3
Subproject commit 8e37c71bfbe7dd70d3212b5d09a69ff4ff62b520

5
deps/Makefile vendored
View file

@ -321,8 +321,8 @@ ifeq ($(CPU_I386),true)
SURGE_CXX_FLAGS += -D__sigemptyset=sigemptyset
endif
# unwanted in this build
SURGE_CXX_FLAGS += -DJUCE_DSP_ENABLE_SNAP_TO_ZERO=0
# use custom JUCE from DISTRHO and Carla
SURGE_CXX_FLAGS += -I$(abspath ../carla/source/modules)
# SIMD must always be enabled, even in debug builds
ifeq ($(NOSIMD),true)
@ -374,6 +374,7 @@ $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt
-DSURGE_SKIP_JUCE_FOR_RACK=TRUE \
-DSURGE_SKIP_LUA=TRUE \
-DSURGE_SKIP_ODDSOUND_MTS=TRUE \
-DSURGE_JUCE_PATH=$(abspath ../carla/source) \
$(SURGE_SRC_PATH)
# --------------------------------------------------------------

10
plugins/Makefile
View file

@ -1086,10 +1086,20 @@ SURGEXT_FLAGS += -DSURGE_RACK_BASE_VERSION=XT1-0-1
SURGEXT_FLAGS += -DSURGE_RACK_PLUG_VERSION=Cardinal
SURGEXT_FLAGS += -DSURGE_RACK_SURGE_VERSION=Cardinal
SURGEXT_FLAGS += -I$(abspath ../carla/source/modules)
MINIPLUGIN_FILES += surgext/src/Delay.cpp
MINIPLUGIN_FILES += surgext/src/DelayLineByFreq.cpp
MINIPLUGIN_FILES += surgext/src/DelayLineByFreqExpanded.cpp
MINIPLUGIN_FILES += surgext/src/EGxVCA.cpp
MINIPLUGIN_FILES += surgext/src/FX.cpp
MINIPLUGIN_FILES += surgext/src/LFO.cpp
MINIPLUGIN_FILES += surgext/src/Mixer.cpp
MINIPLUGIN_FILES += surgext/src/ModMatrix.cpp
MINIPLUGIN_FILES += surgext/src/QuadAD.cpp
MINIPLUGIN_FILES += surgext/src/QuadLFO.cpp
MINIPLUGIN_FILES += surgext/src/VCO.cpp
MINIPLUGIN_FILES += surgext/src/VCF.cpp
MINIPLUGIN_FILES += surgext/src/Waveshaper.cpp
MINIPLUGIN_FILES += surgext/src/XTModule.cpp
MINIPLUGIN_FILES += surgext/src/XTModuleWidget.cpp

7
plugins/plugins-mini.cpp
View file

@ -562,10 +562,12 @@ static void initStatic__surgext()
/*
p->addModel(modelSurgeDelay);
p->addModel(modelSurgeDelayLineByFreq);
p->addModel(modelSurgeDelayLineByFreqExpanded);
p->addModel(modelSurgeVCF);
*/
spl.removeModule("SurgeXTDelay");
spl.removeModule("SurgeXTDelayLineByFreq");
spl.removeModule("SurgeXTDelayLineByFreqExpanded");
spl.removeModule("SurgeXTVCF");
spl.removeModule("SurgeXTFXChorus");
@ -587,11 +589,14 @@ static void initStatic__surgext()
spl.removeModule("SurgeXTFXTreeMonster");
spl.removeModule("SurgeXTFXVocoder");
/* v2.1 modules
/*
p->addModel(modelEGxVCA);
p->addModel(modelQuadAD);
p->addModel(modelQuadLFO);
*/
spl.removeModule("SurgeXTEGxVCA");
spl.removeModule("SurgeXTQuadAD");
spl.removeModule("SurgeXTQuadLFO");
surgext_rack_initialize();
}

3
plugins/plugins.cpp
View file

@ -2883,6 +2883,7 @@ static void initStatic__surgext()
p->addModel(modelSurgeVCF);
p->addModel(modelSurgeDelay);
p->addModel(modelSurgeDelayLineByFreq);
p->addModel(modelSurgeDelayLineByFreqExpanded);
p->addModel(modelSurgeWaveshaper);
p->addModel(modelSurgeLFO);
p->addModel(modelSurgeMixer);
@ -2907,11 +2908,9 @@ static void initStatic__surgext()
p->addModel(modelFXSpringReverb);
p->addModel(modelFXTreeMonster);
/* v2.1 modules
p->addModel(modelEGxVCA);
p->addModel(modelQuadAD);
p->addModel(modelQuadLFO);
*/
surgext_rack_initialize();
}

2
plugins/surgext

@ -1 +1 @@
Subproject commit 41c4ce883f877a1f3d7cabc2cad943f34fde431f
Subproject commit 62a20dce687169bd074be552d09a5b299b446380

2
src/Makefile.cardinal.mk
View file

@ -203,7 +203,7 @@ endif
ifneq ($(NOPLUGINS),true)
ifeq ($(MACOS),true)
EXTRA_DSP_LIBS += -framework Accelerate
EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit
endif
endif