diff options
| author | bunnei <bunneidev@gmail.com> | 2021-05-30 01:36:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 01:36:46 -0700 |
| commit | 95f45112e995c949bc75d6b2d79c91586cb36fe4 (patch) | |
| tree | 52353426b0c2fad36e314c92b94c2d65f6b53782 | |
| parent | a5ebba7e366dcd2b8818c6748296ca5fdeb45ad2 (diff) | |
| parent | 3a6e2922a2566b8873ac244793dc01e82e2e4242 (diff) | |
Merge pull request #6344 from german77/update-libusb
Update libusb to 1.0.24
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 6 | ||||
| m--------- | externals/libusb/libusb | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 70d6735e3..8ed40f01e 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -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() diff --git a/externals/libusb/libusb b/externals/libusb/libusb -Subproject e782eeb2514266f6738e242cdcb18e3ae1ed06f +Subproject c6a35c56016ea2ab2f19115d2ea1e85e0edae15 |