From 283ae3d6af952c7f9fcf92fba41e394176a3a48f Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 5 Dec 2022 20:42:10 +0000 Subject: [PATCH] wasm related fixes Signed-off-by: falkTX --- plugins/surgext | 2 +- src/Makefile.cardinal.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/surgext b/plugins/surgext index 6c5575a..b93eea9 160000 --- a/plugins/surgext +++ b/plugins/surgext @@ -1 +1 @@ -Subproject commit 6c5575a026a3f38443f2b6204314a6da46a05ad3 +Subproject commit b93eea904129bebcd3326059ed9e11227d06f8a6 diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 8ef7ba5..fadbb26 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -213,7 +213,7 @@ ifeq ($(WASM),true) WASM_RESOURCES = $(LV2_RESOURCES) ifneq ($(STATIC_BUILD),true) -WASM_RESOURCES += $(CURDIR)/lv2 +WASM_RESOURCES += $(CURDIR)/lv2/fomp.lv2/manifest.ttl endif EXTRA_DEPENDENCIES += $(WASM_RESOURCES) @@ -333,6 +333,7 @@ SYMLINKED_DIRS_RESOURCES += Mog/res SYMLINKED_DIRS_RESOURCES += nonlinearcircuits/res SYMLINKED_DIRS_RESOURCES += Orbits/presets SYMLINKED_DIRS_RESOURCES += stoermelder-packone/presets +SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables SYMLINKED_DIRS_RESOURCES += surgext/patches SYMLINKED_DIRS_RESOURCES += surgext/presets @@ -452,8 +453,11 @@ $(TARGET_DIR)/%.app/Contents/Resources/distrho.icns: ../../utils/distrho.icns # Extra rules for wasm resources ifeq ($(WASM),true) -$(CURDIR)/lv2: $(LV2_RESOURCES) +$(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) + # FIXME we are past 50Mb compressed assets! :( + rm -rf $(CURDIR)/lv2/mda.lv2 + touch $@ endif # --------------------------------------------------------------