Browse Source

wasm related things and cleanup

tags/v1.1
falkTX 2 years ago
parent
commit
23d07a92be
5 changed files with 6 additions and 9 deletions
  1. +1
    -1
      carla
  2. +1
    -1
      dpf
  3. +0
    -1
      plugins/Common/IldaeilPlugin.cpp
  4. +0
    -2
      plugins/Common/IldaeilUI.cpp
  5. +4
    -4
      plugins/Common/Makefile.mk

+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit a965cc480813a85a2bb88d932b4de797c35ff4d7
Subproject commit f8d7d9afcea4c01aaf502b5af884dde31dfb28a7

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit aaa0f5a5fe62d7e898dc69ddc36fd2800e419da4
Subproject commit 0c0a4e401c2a552145720904b916da21846c8fc1

+ 0
- 1
plugins/Common/IldaeilPlugin.cpp View File

@@ -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<IldaeilPlugin*>(handle));
}


+ 0
- 2
plugins/Common/IldaeilUI.cpp View File

@@ -1299,7 +1299,6 @@ void ildaeilCloseUI(void* ui)
{
DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,);

d_stdout("%s %d", __PRETTY_FUNCTION__, __LINE__);
static_cast<IldaeilUI*>(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<IldaeilUI*>(ui)->openFileFromDSP(isDir, title, filter);
}



+ 4
- 4
plugins/Common/Makefile.mk View File

@@ -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


Loading…
Cancel
Save