From d8612aa3601f308c3be81e0120bbf16772257b46 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 3 Jul 2022 19:33:49 +0100 Subject: [PATCH] More wasm related things, generating "standalones" Signed-off-by: falkTX --- Makefile.base.mk | 8 +++++--- Makefile.plugins.mk | 7 ++++++- distrho/src/DistrhoPluginJACK.cpp | 2 +- distrho/src/DistrhoUIPrivateData.hpp | 2 ++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.base.mk b/Makefile.base.mk index 55dd9a9b..14c55d32 100644 --- a/Makefile.base.mk +++ b/Makefile.base.mk @@ -160,11 +160,11 @@ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections ifeq ($(CPU_I386_OR_X86_64),true) -BASE_OPTS += -mtune=generic -msse -msse2 +BASE_OPTS += -mtune=generic ifeq ($(WASM),true) -BASE_OPTS += -msse3 -msimd128 +# BASE_OPTS += -msse -msse2 -msse3 -msimd128 else -BASE_OPTS += -mfpmath=sse +BASE_OPTS += -msse -msse2 -mfpmath=sse endif endif @@ -546,6 +546,8 @@ endif ifeq ($(MACOS),true) SHARED = -dynamiclib +else ifeq ($(WASM),true) +SHARED = -sSIDE_MODULE=1 else SHARED = -shared endif diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index 147b2068..619b44bc 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -60,7 +60,12 @@ endif # --------------------------------------------------------------------------------------------------------------------- # JACK/Standalone setup -ifneq ($(SKIP_RTAUDIO_FALLBACK),true) +ifeq ($(WASM),true) + +JACK_FLAGS += -sUSE_SDL=2 +JACK_LIBS += -sUSE_SDL=2 + +else ifneq ($(SKIP_RTAUDIO_FALLBACK),true) ifeq ($(MACOS),true) JACK_LIBS += -framework CoreAudio -framework CoreFoundation diff --git a/distrho/src/DistrhoPluginJACK.cpp b/distrho/src/DistrhoPluginJACK.cpp index 446fe15d..44b932f0 100644 --- a/distrho/src/DistrhoPluginJACK.cpp +++ b/distrho/src/DistrhoPluginJACK.cpp @@ -31,7 +31,7 @@ # include "../extra/Thread.hpp" #endif -#ifdef STATIC_BUILD +#if defined(STATIC_BUILD) && !defined(DISTRHO_OS_WASM) # define JACKBRIDGE_DIRECT #endif diff --git a/distrho/src/DistrhoUIPrivateData.hpp b/distrho/src/DistrhoUIPrivateData.hpp index 0ae5a4fb..7aea3ca8 100644 --- a/distrho/src/DistrhoUIPrivateData.hpp +++ b/distrho/src/DistrhoUIPrivateData.hpp @@ -107,6 +107,7 @@ public: explicit PluginApplication() : DGL_NAMESPACE::Application(DISTRHO_UI_IS_STANDALONE) { +#ifndef DISTRHO_OS_WASM const char* const className = ( #ifdef DISTRHO_PLUGIN_BRAND DISTRHO_PLUGIN_BRAND @@ -116,6 +117,7 @@ public: "-" DISTRHO_PLUGIN_NAME ); setClassName(className); +#endif } void triggerIdleCallbacks()