brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ildaeil from wasm builds

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-05-21 02:08:04 +02:00
parent 42de7277a3
commit 9542ea98ac
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/Makefile
View file

@ -259,8 +259,8 @@ ifneq ($(STATIC_BUILD),true)
PLUGIN_FILES += Cardinal/src/AudioFile.cpp PLUGIN_FILES += Cardinal/src/AudioFile.cpp
ifneq ($(WASM),true) ifneq ($(WASM),true)
PLUGIN_FILES += Cardinal/src/Carla.cpp PLUGIN_FILES += Cardinal/src/Carla.cpp
endif
PLUGIN_FILES += Cardinal/src/Ildaeil.cpp PLUGIN_FILES += Cardinal/src/Ildaeil.cpp
endif
ifneq ($(HEADLESS),true) ifneq ($(HEADLESS),true)
ifeq ($(HAVE_X11),true) ifeq ($(HAVE_X11),true)
PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp

4
plugins/plugins.cpp
View file

@ -994,15 +994,15 @@ static void initStatic__Cardinal()
#endif #endif
#ifndef STATIC_BUILD #ifndef STATIC_BUILD
p->addModel(modelAudioFile); p->addModel(modelAudioFile);
p->addModel(modelIldaeil);
#else #else
spl.removeModule("AudioFile"); spl.removeModule("AudioFile");
spl.removeModule("Ildaeil");
#endif #endif
#if !(defined(DISTRHO_OS_WASM) || defined(STATIC_BUILD)) #if !(defined(DISTRHO_OS_WASM) || defined(STATIC_BUILD))
p->addModel(modelCarla); p->addModel(modelCarla);
p->addModel(modelIldaeil);
#else #else
spl.removeModule("Carla"); spl.removeModule("Carla");
spl.removeModule("Ildaeil");
#endif #endif
#ifndef HEADLESS #ifndef HEADLESS
p->addModel(modelSassyScope); p->addModel(modelSassyScope);

10
src/Makefile.cardinal.mk
View file

@ -231,10 +231,6 @@ endif
ifeq ($(WASM),true) ifeq ($(WASM),true)
WASM_RESOURCES = $(TARGET_DIR)/$(NAME).html $(LV2_RESOURCES) 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) EXTRA_DSP_DEPENDENCIES += $(WASM_RESOURCES)
endif endif
@ -292,8 +288,6 @@ ifeq ($(CARDINAL_VARIANT),mini)
LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources
else else
LINK_FLAGS += --preload-file=../../bin/CardinalNative.lv2/resources@/resources 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-cache
LINK_FLAGS += --use-preload-plugins LINK_FLAGS += --use-preload-plugins
endif endif
@ -441,10 +435,6 @@ ifeq ($(WASM),true)
$(TARGET_DIR)/$(NAME).html: ../emscripten/$(NAME).html $(TARGET_DIR)/$(NAME).html: ../emscripten/$(NAME).html
-@mkdir -p $(shell dirname $@) -@mkdir -p $(shell dirname $@)
cp $< $@ 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 endif
# -------------------------------------------------------------- # --------------------------------------------------------------