More wasm details, basics mostly work now

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-07-06 02:02:22 +01:00
parent 034515190c
commit 5370e2ad6e
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
10 changed files with 103 additions and 49 deletions

View file

@ -490,12 +490,9 @@ BOGAUDIO_CUSTOM_PER_FILE = ARQuantity AttackMenuItem ReleaseMenuItem
# --------------------------------------------------------------
# ChowDSP
# FIXME
ifneq ($(WASM),true)
PLUGIN_FILES += $(wildcard ChowDSP/src/*/*.cpp)
PLUGIN_FILES += $(wildcard ChowDSP/src/*/*/*.cpp)
PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp)
endif
# --------------------------------------------------------------
# CatroModulo
@ -828,8 +825,6 @@ UNLESS_MODULES_CUSTOM = Selection
# --------------------------------------------------------------
# ValleyAudio
# FIXME
ifneq ($(WASM),true)
PLUGIN_FILES += $(filter-out ValleyAudio/src/Valley.cpp,$(wildcard ValleyAudio/src/*.cpp))
PLUGIN_FILES += $(wildcard ValleyAudio/src/*/*.cpp)
PLUGIN_FILES += $(wildcard ValleyAudio/src/*/*/*.cpp)
@ -902,7 +897,6 @@ PLUGIN_BINARIES += ValleyAudio/src/XFADE.bin
# modules/types which are present in other plugins
VALLEYAUDIO_CUSTOM = $(DRWAV) DigitalDisplay
VALLEYAUDIO_CUSTOM_PER_FILE = TempoKnob
endif
# --------------------------------------------------------------
# Voxglitch
@ -955,8 +949,8 @@ BASE_FLAGS += -I../dpf/dgl/src/nanovg
BASE_FLAGS += -I../dpf/distrho
BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat
BASE_FLAGS += -I../include/osdialog-stub
BASE_FLAGS += -I../include/simd-compat
ifeq ($(HAVE_X11),true)
BASE_FLAGS += -DHAVE_X11
@ -995,14 +989,16 @@ endif
ifeq ($(BSD),true)
BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
else ifeq ($(WASM),true)
BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
endif
ifeq ($(WASM),true)
BASE_FLAGS += -DNANOVG_GLES2=1
BASE_FLAGS += -msse -msse2 -msse3 -msimd128
else ifneq ($(HAIKU),true)
ifneq ($(WASM),true)
ifneq ($(HAIKU),true)
BASE_FLAGS += -pthread
endif
endif
ifeq ($(WINDOWS),true)
BASE_FLAGS += -D_USE_MATH_DEFINES
@ -1036,6 +1032,10 @@ endif
# Rack code is not tested for this flag, unset it
BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
ifeq ($(WASM),true)
BUILD_CXX_FLAGS += -fexceptions
endif
# --------------------------------------------------------------
# lots of warnings from VCV side

View file

@ -1622,8 +1622,6 @@ static void initStatic__cf()
}
}
// FIXME
#ifndef DISTRHO_OS_WASM
static void initStatic__ChowDSP()
{
Plugin* const p = new Plugin;
@ -1650,7 +1648,6 @@ static void initStatic__ChowDSP()
p->addModel(modelChowChorus);
}
}
#endif
static void initStatic__DrumKit()
{
@ -2589,8 +2586,6 @@ static void initStatic__unless_modules()
}
}
// FIXME
#ifndef DISTRHO_OS_WASM
static void initStatic__ValleyAudio()
{
Plugin* const p = new Plugin;
@ -2609,7 +2604,6 @@ static void initStatic__ValleyAudio()
p->addModel(modelTerrorform);
}
}
#endif
static void initStatic__Voxglitch()
{
@ -2725,10 +2719,7 @@ void initStaticPlugins()
initStatic__BogaudioModules();
initStatic__CatroModulo();
initStatic__cf();
// FIXME
#ifndef DISTRHO_OS_WASM
initStatic__ChowDSP();
#endif
initStatic__DrumKit();
initStatic__ESeries();
initStatic__ExpertSleepersEncoders();
@ -2768,10 +2759,7 @@ void initStaticPlugins()
initStatic__sonusmodular();
initStatic__stocaudio();
initStatic__unless_modules();
// FIXME
#ifndef DISTRHO_OS_WASM
initStatic__ValleyAudio();
#endif
initStatic__Voxglitch();
initStatic__WhatTheRack();
initStatic__ZetaCarinaeModules();