diff --git a/carla b/carla index a965cc4..f8d7d9a 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit a965cc480813a85a2bb88d932b4de797c35ff4d7 +Subproject commit f8d7d9afcea4c01aaf502b5af884dde31dfb28a7 diff --git a/dpf b/dpf index aaa0f5a..0c0a4e4 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit aaa0f5a5fe62d7e898dc69ddc36fd2800e419da4 +Subproject commit 0c0a4e401c2a552145720904b916da21846c8fc1 diff --git a/plugins/Common/IldaeilPlugin.cpp b/plugins/Common/IldaeilPlugin.cpp index df9d5dc..04815a6 100644 --- a/plugins/Common/IldaeilPlugin.cpp +++ b/plugins/Common/IldaeilPlugin.cpp @@ -515,7 +515,6 @@ static void host_ui_custom_data_changed(NativeHostHandle handle, const char* key static void host_ui_closed(NativeHostHandle handle) { - d_stdout("%s %p", __FUNCTION__, handle); ildaeilCloseUI(static_cast(handle)); } diff --git a/plugins/Common/IldaeilUI.cpp b/plugins/Common/IldaeilUI.cpp index 719b18a..026b3d6 100644 --- a/plugins/Common/IldaeilUI.cpp +++ b/plugins/Common/IldaeilUI.cpp @@ -1299,7 +1299,6 @@ void ildaeilCloseUI(void* ui) { DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,); - d_stdout("%s %d", __PRETTY_FUNCTION__, __LINE__); static_cast(ui)->closeUI(); } @@ -1307,7 +1306,6 @@ const char* ildaeilOpenFileForUI(void* const ui, const bool isDir, const char* c { DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr, nullptr); - d_stdout("%s %d", __PRETTY_FUNCTION__, __LINE__); return static_cast(ui)->openFileFromDSP(isDir, title, filter); } diff --git a/plugins/Common/Makefile.mk b/plugins/Common/Makefile.mk index 86edefd..c055f3c 100644 --- a/plugins/Common/Makefile.mk +++ b/plugins/Common/Makefile.mk @@ -51,9 +51,9 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/ysfx.a CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a # FIXME -# ifeq ($(WASM),true) -# STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm -# endif +ifeq ($(WASM),true) +STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm +endif EXTRA_DEPENDENCIES = $(CARLA_EXTRA_LIBS) EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS) @@ -70,7 +70,7 @@ LINK_FLAGS += -sALLOW_MEMORY_GROWTH # LINK_FLAGS += --preload-file=foolme.mp3 # LINK_FLAGS += --preload-file=furelise.mid # LINK_FLAGS += --preload-file=./jsfx -# LINK_FLAGS += --preload-file=./lv2 +LINK_FLAGS += --preload-file=./lv2 # LINK_FLAGS += --shell-file=../Cardinal/src/emscripten/shell.html else ifneq ($(HAIKU),true) BUILD_CXX_FLAGS += -pthread