Browse Source

Fix building webview when enabled in dgl but unused in the plugin

Signed-off-by: falkTX <falktx@falktx.com>
pull/509/head^2
falkTX 2 weeks ago
parent
commit
bb5c31118c
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 2 deletions
  1. +1
    -1
      Makefile.plugins.mk
  2. +5
    -0
      distrho/DistrhoUIMain.cpp
  3. +1
    -1
      distrho/src/DistrhoPluginVST2.cpp

+ 1
- 1
Makefile.plugins.mk View File

@@ -319,7 +319,7 @@ HAVE_DGL = false
endif endif
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) DGL_LIB_SHARED = $(shell $(CC) -print-file-name=Scrt1.o)
endif endif




+ 5
- 0
distrho/DistrhoUIMain.cpp View File

@@ -77,6 +77,11 @@ int main(int argc, char* argv[])
{ {
return DISTRHO_NAMESPACE::dpf_webview_start(argc, 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


#endif #endif

+ 1
- 1
distrho/src/DistrhoPluginVST2.cpp View File

@@ -1710,7 +1710,7 @@ const vst_effect* VSTPluginMain(const vst_host_callback audioMaster)
return effect; 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 DISTRHO_PLUGIN_EXPORT
const vst_effect* VSTPluginMainCompat(vst_host_callback) asm ("main"); const vst_effect* VSTPluginMainCompat(vst_host_callback) asm ("main");




Loading…
Cancel
Save