fix: use offical libusb

Author: PoisonPhang

Makefile.am

@@ -1,49 +1,98 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
+AM_CFLAGS += -fvisibility=hidden $(THREAD_CFLAGS)
+AM_CXXFLAGS += -fvisibility=hidden $(THREAD_CFLAGS)
+
 lib_LTLIBRARIES = libusb-1.0.la
 
-LINUX_USBFS_SRC = os/linux_usbfs.c
-DARWIN_USB_SRC = os/darwin_usb.c
-OPENBSD_USB_SRC = os/openbsd_usb.c
-WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc \
-	libusb-1.0.def
+POSIX_PLATFORM_SRC = os/events_posix.h os/events_posix.c \
+		     os/threads_posix.h os/threads_posix.c
+WINDOWS_PLATFORM_SRC = os/events_windows.h os/events_windows.c \
+		       os/threads_windows.h os/threads_windows.c
+
+if PLATFORM_POSIX
+PLATFORM_SRC = $(POSIX_PLATFORM_SRC)
+else
+PLATFORM_SRC = $(WINDOWS_PLATFORM_SRC)
+endif
+
+OS_DARWIN_SRC = os/darwin_usb.h os/darwin_usb.c
+OS_HAIKU_SRC = os/haiku_usb.h os/haiku_usb_backend.cpp \
+	       os/haiku_pollfs.cpp os/haiku_usb_raw.h os/haiku_usb_raw.cpp
+OS_LINUX_SRC = os/linux_usbfs.h os/linux_usbfs.c
+OS_EMSCRIPTEN_SRC = os/emscripten_webusb.cpp
+OS_NETBSD_SRC = os/netbsd_usb.c
+OS_NULL_SRC = os/null_usb.c
+OS_OPENBSD_SRC = os/openbsd_usb.c
+OS_SUNOS_SRC = os/sunos_usb.h os/sunos_usb.c
+OS_WINDOWS_SRC = libusb-1.0.def libusb-1.0.rc \
+		 os/windows_common.h os/windows_common.c \
+		 os/windows_usbdk.h os/windows_usbdk.c \
+		 os/windows_winusb.h os/windows_winusb.c
 
-EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
-	$(WINDOWS_USB_SRC) os/threads_posix.c os/threads_windows.c
+if OS_DARWIN
+OS_SRC = $(OS_DARWIN_SRC)
+endif
+
+noinst_LTLIBRARIES =
+
+if OS_HAIKU
+noinst_LTLIBRARIES += libusb_haiku.la
+libusb_haiku_la_SOURCES = $(OS_HAIKU_SRC)
+libusb_1_0_la_LIBADD = libusb_haiku.la
+endif
 
 if OS_LINUX
-OS_SRC = $(LINUX_USBFS_SRC)
+OS_SRC = $(OS_LINUX_SRC)
+if USE_UDEV
+OS_SRC += os/linux_udev.c
+else
+OS_SRC += os/linux_netlink.c
+endif
 endif
 
-if OS_DARWIN
-OS_SRC = $(DARWIN_USB_SRC)
-AM_CFLAGS_EXT = -no-cpp-precomp
+if OS_EMSCRIPTEN
+noinst_LTLIBRARIES += libusb_emscripten.la
+libusb_emscripten_la_SOURCES = $(OS_EMSCRIPTEN_SRC)
+AM_CXXFLAGS += -std=c++20
+libusb_1_0_la_LIBADD = libusb_emscripten.la
+endif
+
+if OS_NETBSD
+OS_SRC = $(OS_NETBSD_SRC)
+endif
+
+if OS_NULL
+OS_SRC = $(OS_NULL_SRC)
 endif
 
 if OS_OPENBSD
-OS_SRC = $(OPENBSD_USB_SRC)
+OS_SRC = $(OS_OPENBSD_SRC)
+endif
+
+if OS_SUNOS
+OS_SRC = $(OS_SUNOS_SRC)
 endif
 
 if OS_WINDOWS
-OS_SRC = $(WINDOWS_USB_SRC)
+OS_SRC = $(OS_WINDOWS_SRC)
 
-.rc.lo:
-	$(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@
+include Makefile.am.extra
 
-libusb-1.0.rc: version.h
-endif
+# Dependencies for compiling libusb-1.0.lo from libusb-1.0.rc
+-include ./$(DEPDIR)/libusb-1.0.Plo
 
-if THREADS_POSIX
-THREADS_SRC = os/threads_posix.h os/threads_posix.c
-else
-THREADS_SRC = os/threads_windows.h os/threads_windows.c
+if CREATE_IMPORT_LIB
+all-local: .libs/libusb-1.0.dll.a
+# Rebuild the import lib from the .def so that MS and MinGW DLLs can be interchanged
+.libs/libusb-1.0.dll.a: libusb-1.0.def libusb-1.0.la
+	$(AM_V_DLLTOOL)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $< --dllname libusb-1.0.dll --output-lib $@
+endif
 endif
 
-libusb_1_0_la_CFLAGS = $(AM_CFLAGS) \
-	-DLIBUSB_DESCRIBE=\"`git --git-dir "$(top_srcdir)/.git" describe --tags 2>/dev/null`\"
-libusb_1_0_la_LDFLAGS = $(LTLDFLAGS)
-libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c sync.c $(OS_SRC) \
-	os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h \
-	$(THREADS_SRC) \
-	os/poll_posix.h os/poll_windows.h
+libusb_1_0_la_LDFLAGS = $(LT_LDFLAGS) $(EXTRA_LDFLAGS)
+libusb_1_0_la_SOURCES = libusbi.h version.h version_nano.h \
+	core.c descriptor.c hotplug.c io.c strerror.c sync.c \
+	$(PLATFORM_SRC) $(OS_SRC)
 
-hdrdir = $(includedir)/libusb-1.0
-hdr_HEADERS = libusb.h
+pkginclude_HEADERS = libusb.h

Makefile.am.extra

@@ -0,0 +1,26 @@
+AM_V_DLLTOOL = $(am__v_DLLTOOL_$(V))
+am__v_DLLTOOL_ = $(am__v_DLLTOOL_$(AM_DEFAULT_VERBOSITY))
+am__v_DLLTOOL_0 = @echo "  DLLTOOL " $@;
+am__v_DLLTOOL_1 = 
+
+AM_V_RC = $(am__v_RC_$(V))
+am__v_RC_ = $(am__v_RC_$(AM_DEFAULT_VERBOSITY))
+am__v_RC_0 = @echo "  RC      " $@;
+am__v_RC_1 = 
+
+LTRC = $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=compile $(RC) $(AM_RCFLAGS) \
+       $(RCFLAGS)
+
+RCPPARGS = \
+	--preprocessor-arg -MT \
+	--preprocessor-arg $@ \
+	--preprocessor-arg -MD \
+	--preprocessor-arg -MP \
+	--preprocessor-arg -MF \
+	--preprocessor-arg $$depbase.Tpo
+
+.rc.lo:
+	$(AM_V_RC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+	$(LTRC) $(RCPPARGS) -i $< -o $@ &&\
+	$(am__mv) $$depbase.Tpo $$depbase.Plo