From dc92378e330a2aefeea8b9a9723789c8c82a66f3 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 28 Dec 2022 17:32:52 +0000 Subject: [PATCH] Fix wasm-mini and MOD builds Signed-off-by: falkTX --- src/CardinalFX/DistrhoPluginInfo.h | 1 + src/Makefile.cardinal.mk | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/CardinalFX/DistrhoPluginInfo.h b/src/CardinalFX/DistrhoPluginInfo.h index fef86fc..3a94d84 100644 --- a/src/CardinalFX/DistrhoPluginInfo.h +++ b/src/CardinalFX/DistrhoPluginInfo.h @@ -41,6 +41,7 @@ #ifdef HEADLESS #define DISTRHO_PLUGIN_HAS_UI 0 +#define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 0 #else #define DISTRHO_PLUGIN_HAS_UI 1 #define DISTRHO_PLUGIN_WANT_DIRECT_ACCESS 1 diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 9d857bf..0259c85 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -353,22 +353,29 @@ BASE_FLAGS += -Wno-unused-variable # extra linker flags ifeq ($(WASM),true) -ifneq ($(STATIC_BUILD),true) + +LINK_FLAGS += -O3 +LINK_FLAGS += -sALLOW_MEMORY_GROWTH +LINK_FLAGS += -sINITIAL_MEMORY=64Mb +LINK_FLAGS += -sLZ4=1 + ifeq ($(CARDINAL_VARIANT),mini) LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources else +LINK_FLAGS += --shell-file=../emscripten/shell.html +ifneq ($(STATIC_BUILD),true) +LINK_FLAGS += --use-preload-cache LINK_FLAGS += --use-preload-plugins LINK_FLAGS += --preload-file=./jsfx LINK_FLAGS += --preload-file=./lv2 +endif LINK_FLAGS += --preload-file=../../bin/CardinalNative.lv2/resources@/resources endif -LINK_FLAGS += --use-preload-cache -endif -ifneq ($(NOPLUGINS),true) -SYMLINKED_DIRS_RESOURCES = + # find . -type l | grep -v svg | grep -v ttf | grep -v art | grep -v json | grep -v png | grep -v otf | sort -SYMLINKED_DIRS_RESOURCES += Fundamental/presets +SYMLINKED_DIRS_RESOURCES = Fundamental/presets ifneq ($(CARDINAL_VARIANT),mini) +ifneq ($(NOPLUGINS),true) SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/chopin SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg @@ -391,15 +398,9 @@ SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables SYMLINKED_DIRS_RESOURCES += surgext/patches SYMLINKED_DIRS_RESOURCES += surgext/presets endif +endif LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d)) -endif -LINK_FLAGS += -sALLOW_MEMORY_GROWTH -LINK_FLAGS += -sINITIAL_MEMORY=64Mb -LINK_FLAGS += -sLZ4=1 -ifneq ($(CARDINAL_VARIANT),mini) -LINK_FLAGS += --shell-file=../emscripten/shell.html -endif -LINK_FLAGS += -O3 + else ifeq ($(HAIKU),true) LINK_FLAGS += -lpthread else