From 793d407db49152fdba8fea9b46d46375cc7198ba Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 6 Jul 2022 16:52:22 +0100 Subject: [PATCH] Dont include Carla on wasm builds Signed-off-by: falkTX --- plugins/Makefile | 2 ++ plugins/plugins.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index f3a1788..c8e3db7 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -213,7 +213,9 @@ endif ifneq ($(STATIC_BUILD),true) PLUGIN_FILES += Cardinal/src/AudioFile.cpp +ifneq ($(WASM),true) PLUGIN_FILES += Cardinal/src/Carla.cpp +endif PLUGIN_FILES += Cardinal/src/Ildaeil.cpp ifneq ($(HEADLESS),true) ifeq ($(HAVE_X11),true) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index b38d1b6..64c04d9 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -908,13 +908,16 @@ static void initStatic__Cardinal() #endif #ifndef STATIC_BUILD p->addModel(modelAudioFile); - p->addModel(modelCarla); p->addModel(modelIldaeil); #else spl.removeModule("AudioFile"); - spl.removeModule("Carla"); spl.removeModule("Ildaeil"); #endif + #if !(defined(DISTRHO_OS_WASM) || defined(STATIC_BUILD)) + p->addModel(modelCarla); + #else + spl.removeModule("Carla"); + #endif #ifndef HEADLESS p->addModel(modelSassyScope); #else