Browse Source
Merge pull request #6344 from german77/update-libusb
Update libusb to 1.0.24
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
externals/libusb/CMakeLists.txt
-
externals/libusb/libusb
|
|
|
@ -48,7 +48,7 @@ if(WIN32 OR CYGWIN) |
|
|
|
libusb/libusb/os/threads_windows.c |
|
|
|
libusb/libusb/os/windows_winusb.c |
|
|
|
libusb/libusb/os/windows_usbdk.c |
|
|
|
libusb/libusb/os/windows_nt_common.c |
|
|
|
libusb/libusb/os/windows_common.c |
|
|
|
) |
|
|
|
set(OS_WINDOWS TRUE) |
|
|
|
elseif(APPLE) |
|
|
|
@ -105,7 +105,7 @@ endif() |
|
|
|
|
|
|
|
if(UNIX) |
|
|
|
target_sources(usb PRIVATE |
|
|
|
libusb/libusb/os/poll_posix.c |
|
|
|
libusb/libusb/os/events_posix.c |
|
|
|
libusb/libusb/os/threads_posix.c |
|
|
|
) |
|
|
|
find_package(Threads REQUIRED) |
|
|
|
@ -118,7 +118,7 @@ if(UNIX) |
|
|
|
set(THREADS_POSIX TRUE) |
|
|
|
elseif(WIN32) |
|
|
|
target_sources(usb PRIVATE |
|
|
|
libusb/libusb/os/poll_windows.c |
|
|
|
libusb/libusb/os/events_windows.c |
|
|
|
libusb/libusb/os/threads_windows.c |
|
|
|
) |
|
|
|
endif() |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit e782eeb2514266f6738e242cdcb18e3ae1ed06fa |
|
|
|
Subproject commit c6a35c56016ea2ab2f19115d2ea1e85e0edae155 |
