From 03512bc8f1818a02b0771f0acc40bc9436f1dd11 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 27 Jun 2023 20:31:05 +0200 Subject: [PATCH] Fix regressions with wasm, use old 5Mb stack size Signed-off-by: falkTX --- src/CardinalCommon.cpp | 4 +--- src/Makefile.cardinal.mk | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp index cda32b5..223ac68 100644 --- a/src/CardinalCommon.cpp +++ b/src/CardinalCommon.cpp @@ -502,14 +502,12 @@ Initializer::Initializer(const CardinalBasePlugin* const plugin, const CardinalB if (isRealInstance) { + system::createDirectory(asset::userDir); #ifdef DISTRHO_OS_WASM EM_ASM({ - Module.FS.mkdir('/userfiles'); Module.FS.mount(Module.IDBFS, {}, '/userfiles'); Module.FS.syncfs(true, function(err) { if (!err) { dynCall('vi', $0, [$1]) } }); }, WebBrowserDataLoaded, this); - #else - system::createDirectory(asset::userDir); #endif } } diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 4003ddd..f05c936 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -283,8 +283,11 @@ LINK_FLAGS += -O3 LINK_FLAGS += -sALLOW_MEMORY_GROWTH LINK_FLAGS += -sINITIAL_MEMORY=64Mb LINK_FLAGS += -sLZ4=1 +LINK_FLAGS += -sSTACK_SIZE=5MB LINK_FLAGS += -lidbfs.js +JACK_LIBS += -sEXPORTED_RUNTIME_METHODS=IDBFS,FS,cwrap + ifeq ($(CARDINAL_VARIANT),mini) LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources else @@ -344,7 +347,8 @@ ifeq ($(MACOS),true) LINK_FLAGS += -framework IOKit else ifeq ($(WINDOWS),true) # needed by VCVRack -EXTRA_DSP_LIBS += -ldbghelp -lshlwapi -Wl,--stack,0x100000 +LINK_FLAGS += -Wl,--stack,0x100000 +EXTRA_DSP_LIBS += -ldbghelp -lshlwapi # needed by JW-Modules EXTRA_DSP_LIBS += -lws2_32 -lwinmm endif