Merge branch 'main' into fix-visibility

Author: Youw

CMakeLists.txt

@@ -74,6 +74,10 @@ function(generate_config_file)
         set(ENABLE_DEBUG_LOGGING ${LIBUSB_ENABLE_DEBUG_LOGGING})
     endif()
 
+    if(WIN32 AND LIBUSB_ENABLE_WINDOWS_HOTPLUG)
+        set(LIBUSB_WINDOWS_HOTPLUG 1)
+    endif()
+
     file(MAKE_DIRECTORY "${LIBUSB_GEN_INCLUDES}")
     if(NOT MSVC)
         set(_GNU_SOURCE TRUE)
@@ -104,6 +108,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     option(LIBUSB_ENABLE_UDEV "Enable udev backend for device enumeration" ON)
 endif()
 
+if(WIN32)
+    option(LIBUSB_ENABLE_WINDOWS_HOTPLUG "Enable Windows hotplug support" OFF)
+endif()
+
 set(LIBUSB_GEN_INCLUDES "${CMAKE_CURRENT_BINARY_DIR}/gen_include")
 generate_config_file()
 
@@ -160,6 +168,13 @@ if(WIN32)
     )
     target_compile_definitions(usb-1.0 PRIVATE $<$<C_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS=1>)
     target_link_libraries(usb-1.0 PRIVATE windowsapp)
+    if(LIBUSB_ENABLE_WINDOWS_HOTPLUG)
+        target_sources(usb-1.0 PRIVATE
+            "${LIBUSB_ROOT}/os/windows_hotplug.c"
+            "${LIBUSB_ROOT}/os/windows_hotplug.h"
+        )
+        target_compile_definitions(usb-1.0 PRIVATE LIBUSB_WINDOWS_HOTPLUG=1)
+    endif()
     set_target_properties(usb-1.0 PROPERTIES UNITY_BUILD OFF)
 else()
     # common POSIX/non-Windows sources

config.h.in

@@ -52,6 +52,9 @@
 /* #define to 1 if compiling for a Windows platform. */
 #cmakedefine PLATFORM_WINDOWS 1
 
+/* #define to 1 to enable Windows hotplug support. */
+#cmakedefine LIBUSB_WINDOWS_HOTPLUG 1
+
 
 #if defined(__GNUC__)
  #define PRINTF_FORMAT(a, b) __attribute__ ((format (__printf__, a, b)))