diff --git a/Makefile.base.mk b/Makefile.base.mk index 3156686e..a54d1f1f 100644 --- a/Makefile.base.mk +++ b/Makefile.base.mk @@ -89,13 +89,23 @@ endif # --------------------------------------------------------------------------------------------------------------------- # Set PKG_CONFIG (can be overridden by environment variable) -ifeq ($(WINDOWS),true) +ifeq ($(WASM),true) +# Skip on wasm by default +PKG_CONFIG ?= false +else ifeq ($(WINDOWS),true) # Build statically on Windows by default PKG_CONFIG ?= pkg-config --static else PKG_CONFIG ?= pkg-config endif +# --------------------------------------------------------------------------------------------------------------------- +# Set cross compiling flag + +ifeq ($(WASM),true) +CROSS_COMPILING = true +endif + # --------------------------------------------------------------------------------------------------------------------- # Set LINUX_OR_MACOS diff --git a/distrho/extra/Thread.hpp b/distrho/extra/Thread.hpp index ec6f13d9..63a01acf 100644 --- a/distrho/extra/Thread.hpp +++ b/distrho/extra/Thread.hpp @@ -25,6 +25,10 @@ # include #endif +#ifdef DISTRHO_OS_WASM +# error Threads do not work under wasm! +#endif + START_NAMESPACE_DISTRHO // ----------------------------------------------------------------------- diff --git a/distrho/src/jackbridge/SDLBridge.hpp b/distrho/src/jackbridge/SDLBridge.hpp index 2027e386..38faf1d6 100644 --- a/distrho/src/jackbridge/SDLBridge.hpp +++ b/distrho/src/jackbridge/SDLBridge.hpp @@ -194,15 +194,15 @@ struct SDLBridge { float* const fstream = (float*)stream; -#if DISTRHO_PLUGIN_NUM_OUTPUTS == 0 +// #if DISTRHO_PLUGIN_NUM_OUTPUTS == 0 if (self->jackProcessCallback == nullptr) -#endif +// #endif { std::memset(fstream, 0, len); return; } -#if DISTRHO_PLUGIN_NUM_OUTPUTS > 0 +// #if DISTRHO_PLUGIN_NUM_OUTPUTS > 0 const uint numFrames = static_cast(static_cast(len) / sizeof(float) / DISTRHO_PLUGIN_NUM_OUTPUTS); self->jackProcessCallback(numFrames, self->jackProcessArg); @@ -212,7 +212,7 @@ struct SDLBridge { for (uint j=0; j < numFrames; ++j) fstream[j * DISTRHO_PLUGIN_NUM_OUTPUTS + i] = self->audioBuffers[DISTRHO_PLUGIN_NUM_INPUTS+i][j]; } -#endif +// #endif } };