From 22b129403e5938d5592a52590451b890cc2b564d Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 28 Dec 2022 20:51:50 +0000 Subject: [PATCH] A few build fixes Signed-off-by: falkTX --- deps/Makefile | 9 +++++++++ src/Cardinal/DistrhoPluginInfo.h | 1 + src/CardinalNative/DistrhoPluginInfo.h | 1 + src/CardinalSynth/DistrhoPluginInfo.h | 1 + src/CardinalUI.cpp | 1 + src/custom/RemoteNanoVG.cpp | 5 ++++- 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/deps/Makefile b/deps/Makefile index b21e402..8037a9b 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -324,6 +324,15 @@ endif # unwanted in this build SURGE_CXX_FLAGS += -DJUCE_DSP_ENABLE_SNAP_TO_ZERO=0 +# required by JUCE +ifeq ($(WASM),true) +SURGE_CXX_FLAGS += -msse -msse2 -msse3 -msimd128 +else ifeq ($(CPU_ARM32),true) +SURGE_CXX_FLAGS += -mfpu=neon-vfpv4 -mfloat-abi=hard +else ifeq ($(CPU_I386_OR_X86_64),true) +SURGE_CXX_FLAGS += -msse -msse2 +endif + # possibly use fftw? # ifeq ($(shell $(PKG_CONFIG) --exists fftw3 fftw3f && echo true),true) # SURGE_CXX_FLAGS += -DJUCE_DSP_USE_STATIC_FFTW=1 diff --git a/src/Cardinal/DistrhoPluginInfo.h b/src/Cardinal/DistrhoPluginInfo.h index 408f43b..4246569 100644 --- a/src/Cardinal/DistrhoPluginInfo.h +++ b/src/Cardinal/DistrhoPluginInfo.h @@ -35,6 +35,7 @@ #ifdef HEADLESS #define DISTRHO_PLUGIN_HAS_UI 0 +#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 0 #else #define DISTRHO_PLUGIN_HAS_UI 1 #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 diff --git a/src/CardinalNative/DistrhoPluginInfo.h b/src/CardinalNative/DistrhoPluginInfo.h index 5cdfbd6..3b8081d 100644 --- a/src/CardinalNative/DistrhoPluginInfo.h +++ b/src/CardinalNative/DistrhoPluginInfo.h @@ -40,6 +40,7 @@ #ifdef HEADLESS #define DISTRHO_PLUGIN_HAS_UI 0 +#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 0 #else #define DISTRHO_PLUGIN_HAS_UI 1 #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 diff --git a/src/CardinalSynth/DistrhoPluginInfo.h b/src/CardinalSynth/DistrhoPluginInfo.h index 42dfba8..5147667 100644 --- a/src/CardinalSynth/DistrhoPluginInfo.h +++ b/src/CardinalSynth/DistrhoPluginInfo.h @@ -34,6 +34,7 @@ #ifdef HEADLESS #define DISTRHO_PLUGIN_HAS_UI 0 +#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 0 #else #define DISTRHO_PLUGIN_HAS_UI 1 #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp index b3b7b23..b664736 100644 --- a/src/CardinalUI.cpp +++ b/src/CardinalUI.cpp @@ -81,6 +81,7 @@ START_NAMESPACE_DISTRHO #if ! DISTRHO_PLUGIN_WANT_DIRECT_ACCESS const char* Plugin::getBundlePath() const noexcept { return nullptr; } +bool Plugin::isSelfTestInstance() const noexcept { return false; } bool Plugin::writeMidiEvent(const MidiEvent&) noexcept { return false; } #endif diff --git a/src/custom/RemoteNanoVG.cpp b/src/custom/RemoteNanoVG.cpp index 73651db..d96e6c7 100644 --- a/src/custom/RemoteNanoVG.cpp +++ b/src/custom/RemoteNanoVG.cpp @@ -18,7 +18,10 @@ #include "DistrhoPluginInfo.h" #ifndef DISTRHO_PLUGIN_WANT_DIRECT_ACCESS -# error wrong build +# error wrong build 1 +#endif +#if DISTRHO_PLUGIN_WANT_DIRECT_ACCESS +# error wrong build 2 #endif // #if ! DISTRHO_PLUGIN_WANT_DIRECT_ACCESS