From bb5c31118ca47a266c8468cf07cb88b370161cef Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 9 Oct 2025 22:16:20 +0200 Subject: [PATCH] Fix building webview when enabled in dgl but unused in the plugin Signed-off-by: falkTX --- Makefile.plugins.mk | 2 +- distrho/DistrhoUIMain.cpp | 5 +++++ distrho/src/DistrhoPluginVST2.cpp | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index ec97d624..f5395808 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -319,7 +319,7 @@ HAVE_DGL = false endif endif -ifeq ($(HAVE_DGL)$(LINUX)$(UI_TYPE),truetruewebview) +ifeq ($(HAVE_DGL)$(LINUX)$(USE_WEB_VIEW),truetruetrue) DGL_LIB_SHARED = $(shell $(CC) -print-file-name=Scrt1.o) endif diff --git a/distrho/DistrhoUIMain.cpp b/distrho/DistrhoUIMain.cpp index efc5d9f7..9a80087a 100644 --- a/distrho/DistrhoUIMain.cpp +++ b/distrho/DistrhoUIMain.cpp @@ -77,6 +77,11 @@ int main(int argc, char* argv[]) { return DISTRHO_NAMESPACE::dpf_webview_start(argc, argv); } +#elif defined(DISTRHO_OS_LINUX) && defined(DGL_USE_WEB_VIEW) && !DISTRHO_IS_STANDALONE +int main() +{ + return 0; +} #endif #endif diff --git a/distrho/src/DistrhoPluginVST2.cpp b/distrho/src/DistrhoPluginVST2.cpp index 00a02613..4f3c4b5e 100644 --- a/distrho/src/DistrhoPluginVST2.cpp +++ b/distrho/src/DistrhoPluginVST2.cpp @@ -1710,7 +1710,7 @@ const vst_effect* VSTPluginMain(const vst_host_callback audioMaster) return effect; } -#if !(defined(DISTRHO_OS_MAC) || defined(DISTRHO_OS_WASM) || defined(DISTRHO_OS_WINDOWS) || DISTRHO_UI_WEB_VIEW) +#if !(defined(DISTRHO_OS_MAC) || defined(DISTRHO_OS_WASM) || defined(DISTRHO_OS_WINDOWS) || (defined(DISTRHO_OS_LINUX) && defined(DGL_USE_WEB_VIEW))) DISTRHO_PLUGIN_EXPORT const vst_effect* VSTPluginMainCompat(vst_host_callback) asm ("main");