diff --git a/plugins/Makefile b/plugins/Makefile index 6d7cf81..6faad68 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -259,8 +259,8 @@ 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 +endif ifneq ($(HEADLESS),true) ifeq ($(HAVE_X11),true) PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 78e800c..a8e50aa 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -994,15 +994,15 @@ static void initStatic__Cardinal() #endif #ifndef STATIC_BUILD p->addModel(modelAudioFile); - p->addModel(modelIldaeil); #else spl.removeModule("AudioFile"); - spl.removeModule("Ildaeil"); #endif #if !(defined(DISTRHO_OS_WASM) || defined(STATIC_BUILD)) p->addModel(modelCarla); + p->addModel(modelIldaeil); #else spl.removeModule("Carla"); + spl.removeModule("Ildaeil"); #endif #ifndef HEADLESS p->addModel(modelSassyScope); diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index cff6cfb..c7140ee 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -231,10 +231,6 @@ endif ifeq ($(WASM),true) WASM_RESOURCES = $(TARGET_DIR)/$(NAME).html $(LV2_RESOURCES) -ifneq ($(CARDINAL_VARIANT),mini) -WASM_RESOURCES += $(CURDIR)/lv2/fomp.lv2/manifest.ttl -endif - EXTRA_DSP_DEPENDENCIES += $(WASM_RESOURCES) endif @@ -292,8 +288,6 @@ ifeq ($(CARDINAL_VARIANT),mini) LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources else LINK_FLAGS += --preload-file=../../bin/CardinalNative.lv2/resources@/resources -LINK_FLAGS += --preload-file=./jsfx -LINK_FLAGS += --preload-file=./lv2 LINK_FLAGS += --use-preload-cache LINK_FLAGS += --use-preload-plugins endif @@ -441,10 +435,6 @@ ifeq ($(WASM),true) $(TARGET_DIR)/$(NAME).html: ../emscripten/$(NAME).html -@mkdir -p $(shell dirname $@) cp $< $@ - -$(CURDIR)/lv2/fomp.lv2/manifest.ttl: $(TARGET_DIR)/$(NAME).lv2/resources/PluginManifests/Cardinal.json - wget -O - https://falktx.com/data/wasm-things-2022-08-15.tar.gz | tar xz -C $(CURDIR) - touch $@ endif # --------------------------------------------------------------