From dd29816464d077d4d1724a65f53fcef286d43047 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 27 Dec 2022 15:10:53 +0000 Subject: [PATCH] Adjust for wasm mini builds, WIP Signed-off-by: falkTX --- plugins/Makefile | 2 ++ src/CardinalMini/Makefile | 2 ++ src/Makefile | 1 + src/Makefile.cardinal.mk | 14 +++++++++++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 0197731..19aaf79 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1402,7 +1402,9 @@ LV2_RESOURCES += $(MINIRESOURCE_FILES:%=../bin/CardinalMini.lv2/resources/%) else ifeq ($(WASM),true) LV2_RESOURCES = $(PLUGIN_LIST:%=../bin/CardinalNative.lv2/resources/PluginManifests/%.json) +LV2_RESOURCES += $(MINIPLUGIN_LIST:%=../bin/CardinalMini.lv2/resources/PluginManifests/%.json) LV2_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalNative.lv2/resources/%) +LV2_RESOURCES += $(MINIRESOURCE_FILES:%=../bin/CardinalMini.lv2/resources/%) else diff --git a/src/CardinalMini/Makefile b/src/CardinalMini/Makefile index 24e5043..fa53a8e 100644 --- a/src/CardinalMini/Makefile +++ b/src/CardinalMini/Makefile @@ -5,4 +5,6 @@ # NAME = CardinalMini +PLUGIN_CLASS = distrho_cardinal_mini +PLUGIN_URI = https://distrho.kx.studio/plugins/cardinal\#mini include ../Makefile.cardinal.mk diff --git a/src/Makefile b/src/Makefile index ecdbd96..c5b45bc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -234,6 +234,7 @@ ifeq ($(MOD_BUILD),true) $(MAKE) -C CardinalFX lv2 else ifeq ($(WASM),true) $(MAKE) -C CardinalNative +# $(MAKE) -C CardinalMini modgui else $(MAKE) -C Cardinal $(MAKE) -C CardinalMini diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 525dcc9..650a788 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -177,7 +177,7 @@ endif # -------------------------------------------------------------- # FIXME -ifeq ($(CIBUILD)$(WASM),truetrue) +ifeq ($(CARDINAL_VARIANT)$(CIBUILD)$(WASM),nativetruetrue) ifneq ($(STATIC_BUILD),true) STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm endif @@ -350,21 +350,26 @@ BASE_FLAGS += -Wno-unused-variable ifeq ($(WASM),true) ifneq ($(STATIC_BUILD),true) +ifeq ($(CARDINAL_VARIANT),mini) +LINK_FLAGS += --preload-file=../../bin/CardinalMini.lv2/resources@/resources +else 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 +ifneq ($(CARDINAL_VARIANT),mini) SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/chopin SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg SYMLINKED_DIRS_RESOURCES += cf/playeroscs SYMLINKED_DIRS_RESOURCES += DrumKit/res/samples -SYMLINKED_DIRS_RESOURCES += Fundamental/presets SYMLINKED_DIRS_RESOURCES += GrandeModular/presets SYMLINKED_DIRS_RESOURCES += LyraeModules/presets SYMLINKED_DIRS_RESOURCES += Meander/res @@ -381,12 +386,15 @@ 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 +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