More cmake webview build fixes

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -37,6 +37,7 @@ ifeq ($(HAVE_CAIRO),true)
 endif
 ifeq ($(HAVE_DGL),true)
 	$(MAKE) all -C examples/EmbedExternalUI
+	$(MAKE) all -C examples/WebMeters
 endif
 
 ifeq ($(CAN_GENERATE_TTL),true)
@@ -68,6 +69,7 @@ clean:
 	$(MAKE) clean -C examples/Parameters
 	$(MAKE) clean -C examples/SendNote
 	$(MAKE) clean -C examples/States
+	$(MAKE) clean -C examples/WebMeters
 	$(MAKE) clean -C utils/lv2-ttl-generator
 	rm -rf bin build
 

Makefile.plugins.mk

@@ -52,9 +52,9 @@ endif
 # Check for proper UI_TYPE parameter
 
 ifeq ($(UI_TYPE),)
-else ifeq ($(UI_TYPE),generic)
-else ifeq ($(UI_TYPE),external)
 else ifeq ($(UI_TYPE),cairo)
+else ifeq ($(UI_TYPE),external)
+else ifeq ($(UI_TYPE),generic)
 else ifeq ($(UI_TYPE),opengl)
 else ifeq ($(UI_TYPE),opengl3)
 USE_OPENGL3 = true
@@ -512,9 +512,6 @@ $(DGL_BUILD_DIR)/libdgl-stub.a: $(DGL_POSSIBLE_DEPS)
 $(DGL_BUILD_DIR)/libdgl-vulkan.a: $(DGL_POSSIBLE_DEPS)
 	$(MAKE) -C $(DPF_PATH)/dgl vulkan
 
-$(DGL_BUILD_DIR)/libdgl-web.a: $(DGL_POSSIBLE_DEPS)
-	$(MAKE) -C $(DPF_PATH)/dgl web
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(BUILD_DIR)/DistrhoPluginMain_%.cpp.o: $(DPF_PATH)/distrho/DistrhoPluginMain.cpp $(EXTRA_DEPENDENCIES) $(EXTRA_DSP_DEPENDENCIES)

cmake/DPF-plugin.cmake

@@ -193,12 +193,15 @@ function(dpf_add_plugin NAME)
     target_link_libraries("${NAME}-ui" PUBLIC "${NAME}" ${_dgl_library})
     if((NOT WIN32) AND (NOT APPLE) AND (NOT HAIKU))
       target_link_libraries("${NAME}-ui" PRIVATE "dl")
-      if(_dpf_plugin_USE_WEB_VIEW)
+      if(LINUX AND _dpf_plugin_USE_WEB_VIEW)
+        execute_process(COMMAND ${CMAKE_C_COMPILER} -print-file-name=Scrt1.o
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          OUTPUT_VARIABLE _dpf_plugin_shared_crt)
         target_link_libraries("${NAME}-ui" PRIVATE "rt")
       endif()
     endif()
     # add the files containing C++17 or Objective-C classes
-    dpf__add_plugin_specific_ui_sources("${NAME}-ui" $<BOOL:${_dpf_plugin_USE_WEB_VIEW}>)
+    dpf__add_plugin_specific_ui_sources("${NAME}-ui" "${_dpf_plugin_USE_WEB_VIEW}")
   else()
     add_library("${NAME}-ui" INTERFACE)
   endif()
@@ -212,13 +215,13 @@ function(dpf_add_plugin NAME)
     elseif(_target STREQUAL "dssi")
       dpf__build_dssi("${NAME}" "${_dgl_has_ui}")
     elseif(_target STREQUAL "lv2")
-      dpf__build_lv2("${NAME}" "${_dgl_has_ui}" "${_dpf_plugin_MONOLITHIC}")
+      dpf__build_lv2("${NAME}" "${_dgl_has_ui}" "${_dpf_plugin_MONOLITHIC}" "${_dpf_plugin_shared_crt}")
     elseif(_target STREQUAL "vst2")
-      dpf__build_vst2("${NAME}" "${_dgl_has_ui}")
+      dpf__build_vst2("${NAME}" "${_dgl_has_ui}" "${_dpf_plugin_shared_crt}")
     elseif(_target STREQUAL "vst3")
-      dpf__build_vst3("${NAME}" "${_dgl_has_ui}")
+      dpf__build_vst3("${NAME}" "${_dgl_has_ui}" "${_dpf_plugin_shared_crt}")
     elseif(_target STREQUAL "clap")
-      dpf__build_clap("${NAME}" "${_dgl_has_ui}")
+      dpf__build_clap("${NAME}" "${_dgl_has_ui}" "${_dpf_plugin_shared_crt}")
     elseif(_target STREQUAL "au")
       if (APPLE)
         dpf__build_au("${NAME}" "${_dgl_has_ui}")
@@ -372,7 +375,7 @@ endfunction()
 #
 # Add build rules for an LV2 plugin.
 #
-function(dpf__build_lv2 NAME HAS_UI MONOLITHIC)
+function(dpf__build_lv2 NAME HAS_UI MONOLITHIC EXTRA_UI_LINK_OPTS)
   dpf__create_dummy_source_list(_no_srcs)
 
   dpf__add_module("${NAME}-lv2" ${_no_srcs})
@@ -393,12 +396,14 @@ function(dpf__build_lv2 NAME HAS_UI MONOLITHIC)
     if(MONOLITHIC)
       dpf__add_ui_main("${NAME}-lv2" "lv2" "${HAS_UI}")
       target_link_libraries("${NAME}-lv2" PRIVATE "${NAME}-ui")
+      target_link_options("${NAME}-lv2" PRIVATE "${EXTRA_UI_LINK_OPTS}")
       set_target_properties("${NAME}-lv2" PROPERTIES
         OUTPUT_NAME "${NAME}")
     else()
       dpf__add_module("${NAME}-lv2-ui" ${_no_srcs})
       dpf__add_ui_main("${NAME}-lv2-ui" "lv2" "${HAS_UI}")
       dpf__set_module_export_list("${NAME}-lv2-ui" "lv2-ui")
+      target_link_options("${NAME}-lv2-ui" PRIVATE "${EXTRA_UI_LINK_OPTS}")
       target_link_libraries("${NAME}-lv2-ui" PRIVATE "${NAME}-ui")
       set_target_properties("${NAME}-lv2-ui" PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/${NAME}.lv2/$<0:>"
@@ -427,7 +432,7 @@ endfunction()
 #
 # Add build rules for a VST2 plugin.
 #
-function(dpf__build_vst2 NAME HAS_UI)
+function(dpf__build_vst2 NAME HAS_UI EXTRA_UI_LINK_OPTS)
   dpf__create_dummy_source_list(_no_srcs)
 
   dpf__add_module("${NAME}-vst2" ${_no_srcs})
@@ -435,6 +440,7 @@ function(dpf__build_vst2 NAME HAS_UI)
   dpf__add_ui_main("${NAME}-vst2" "vst2" "${HAS_UI}")
   dpf__set_module_export_list("${NAME}-vst2" "vst2")
   target_link_libraries("${NAME}-vst2" PRIVATE "${NAME}-dsp" "${NAME}-ui")
+  target_link_options("${NAME}-vst2" PRIVATE "${EXTRA_UI_LINK_OPTS}")
   set_target_properties("${NAME}-vst2" PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/$<0:>"
     ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/obj/vst2/$<0:>"
@@ -505,7 +511,7 @@ endfunction()
 #
 # Add build rules for a VST3 plugin.
 #
-function(dpf__build_vst3 NAME HAS_UI)
+function(dpf__build_vst3 NAME HAS_UI EXTRA_UI_LINK_OPTS)
   dpf__determine_vst3_package_architecture(vst3_arch)
 
   dpf__create_dummy_source_list(_no_srcs)
@@ -515,6 +521,7 @@ function(dpf__build_vst3 NAME HAS_UI)
   dpf__add_ui_main("${NAME}-vst3" "vst3" "${HAS_UI}")
   dpf__set_module_export_list("${NAME}-vst3" "vst3")
   target_link_libraries("${NAME}-vst3" PRIVATE "${NAME}-dsp" "${NAME}-ui")
+  target_link_options("${NAME}-vst3" PRIVATE "${EXTRA_UI_LINK_OPTS}")
   set_target_properties("${NAME}-vst3" PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/obj/vst3/$<0:>"
     OUTPUT_NAME "${NAME}"
@@ -547,7 +554,7 @@ endfunction()
 #
 # Add build rules for a CLAP plugin.
 #
-function(dpf__build_clap NAME HAS_UI)
+function(dpf__build_clap NAME HAS_UI EXTRA_UI_LINK_OPTS)
   dpf__create_dummy_source_list(_no_srcs)
 
   dpf__add_module("${NAME}-clap" ${_no_srcs})
@@ -555,6 +562,7 @@ function(dpf__build_clap NAME HAS_UI)
   dpf__add_ui_main("${NAME}-clap" "clap" "${HAS_UI}")
   dpf__set_module_export_list("${NAME}-clap" "clap")
   target_link_libraries("${NAME}-clap" PRIVATE "${NAME}-dsp" "${NAME}-ui")
+  target_link_options("${NAME}-clap" PRIVATE "${EXTRA_UI_LINK_OPTS}")
   set_target_properties("${NAME}-clap" PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/$<0:>"
     ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/obj/clap/$<0:>"
@@ -983,15 +991,15 @@ endfunction()
 # dpf__add_plugin_specific_ui_sources
 # ------------------------------------------------------------------------------
 #
-# Compile system specific files, for now it is just Objective-C code
+# Compile system specific files
 #
 function(dpf__add_plugin_specific_ui_sources NAME USE_WEB_VIEW)
   if(APPLE)
     target_sources("${NAME}" PRIVATE
       "${DPF_ROOT_DIR}/distrho/DistrhoUI_macOS.mm")
-    if (USE_WEB_VIEW)
+    if(USE_WEB_VIEW)
       find_library(APPLE_WEBKIT_FRAMEWORK "WebKit")
-      target_link_libraries(dgl-system-libs INTERFACE "${APPLE_WEBKIT_FRAMEWORK}")
+      target_link_libraries("${NAME}" PRIVATE "${APPLE_WEBKIT_FRAMEWORK}")
     endif()
   elseif(WIN32 AND USE_WEB_VIEW)
     target_sources("${NAME}" PRIVATE
@@ -1003,6 +1011,7 @@ function(dpf__add_plugin_specific_ui_sources NAME USE_WEB_VIEW)
       set_source_files_properties("${DPF_ROOT_DIR}/distrho/DistrhoUI_win32.cpp"
         PROPERTIES COMPILE_FLAGS -std=gnu++17)
     endif()
+    target_link_libraries("${NAME}" PRIVATE "ole32" "uuid")
   endif()
 endfunction()
 
@@ -1154,6 +1163,9 @@ function(dpf__set_target_defaults NAME)
   if (CMAKE_COMPILER_IS_GNUCXX)
     target_compile_options("${NAME}" PUBLIC "-fno-gnu-unique")
   endif()
+  if ((NOT APPLE) AND (NOT MSVC))
+    target_link_options("${NAME}" PUBLIC "-Wl,--no-undefined")
+  endif()
 endfunction()
 
 # dpf__add_plugin_main

distrho/DistrhoUIMain.cpp

@@ -58,6 +58,19 @@
 #  define DISTRHO_IS_STANDALONE 0
 # endif
 # include "src/DistrhoUtils.cpp"
+#else
+# ifdef DISTRHO_PLUGIN_TARGET_JACK
+#  define DISTRHO_IS_STANDALONE 1
+# else
+#  define DISTRHO_IS_STANDALONE 0
+# endif
+#endif
+
+#if defined(DPF_USING_LD_LINUX_WEBVIEW) && !DISTRHO_IS_STANDALONE
+int main(int argc, char* argv[])
+{
+    return DISTRHO_NAMESPACE::dpf_webview_start(argc, argv);
+}
 #endif
 
 #endif

distrho/src/DistrhoPluginChecks.h

@@ -155,6 +155,10 @@
 # error typo detected use DGL_USE_FILE_BROWSER instead of DISTRHO_UI_FILEBROWSER
 #endif
 
+#ifdef DISTRHO_UI_WEBVIEW
+# error typo detected use DISTRHO_UI_WEB_VIEW instead of DISTRHO_UI_WEBVIEW
+#endif
+
 #ifdef DISTRHO_UI_USE_WEBVIEW
 # error typo detected use DISTRHO_UI_USE_WEB_VIEW instead of DISTRHO_UI_USE_WEBVIEW
 #endif
@@ -163,7 +167,7 @@
 # error invalid build config: file browser requested but `USE_FILE_BROWSER` build option is not set
 #endif
 
-#if DISTRHO_UI_USE_WEB_VIEW && !defined(DGL_USE_WEB_VIEW)
+#if DISTRHO_UI_WEB_VIEW && !defined(DGL_USE_WEB_VIEW)
 # error invalid build config: web view requested but `USE_WEB_VIEW` build option is not set
 #endif
 
@@ -278,7 +282,7 @@ static_assert(sizeof(STRINGIFY(DISTRHO_PLUGIN_UNIQUE_ID)) == 5, "The macro DISTR
 // --------------------------------------------------------------------------------------------------------------------
 // Set DPF_USING_LD_LINUX_WEBVIEW for internal use
 
-#if DISTRHO_UI_WEB_VIEW && defined(__linux__)
+#if DISTRHO_UI_WEB_VIEW && defined(DISTRHO_OS_LINUX)
 # define DPF_USING_LD_LINUX_WEBVIEW
 #endif
 

distrho/src/DistrhoUtils.cpp

@@ -174,10 +174,3 @@ int dpf_webview_start(int argc, char* argv[]);
 // --------------------------------------------------------------------------------------------------------------------
 
 END_NAMESPACE_DISTRHO
-
-#if defined(DPF_USING_LD_LINUX_WEBVIEW) && !DISTRHO_IS_STANDALONE
-int main(int argc, char* argv[])
-{
-    return DISTRHO_NAMESPACE::dpf_webview_start(argc, argv);
-}
-#endif

examples/EmbedExternalUI/CMakeLists.txt

@@ -4,6 +4,7 @@
 dpf_add_plugin(d_embed_external_ui
   TARGETS jack lv2 vst2 vst3 clap
   UI_TYPE external
+  USE_WEB_VIEW
   FILES_DSP
     EmbedExternalExamplePlugin.cpp
   FILES_UI