mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-11-15 07:40:04 +00:00
Merge pull request #6344 from german77/update-libusb
Update libusb to 1.0.24
This commit is contained in:
commit
95f45112e9
6
externals/libusb/CMakeLists.txt
vendored
6
externals/libusb/CMakeLists.txt
vendored
@ -48,7 +48,7 @@ if(WIN32 OR CYGWIN)
|
|||||||
libusb/libusb/os/threads_windows.c
|
libusb/libusb/os/threads_windows.c
|
||||||
libusb/libusb/os/windows_winusb.c
|
libusb/libusb/os/windows_winusb.c
|
||||||
libusb/libusb/os/windows_usbdk.c
|
libusb/libusb/os/windows_usbdk.c
|
||||||
libusb/libusb/os/windows_nt_common.c
|
libusb/libusb/os/windows_common.c
|
||||||
)
|
)
|
||||||
set(OS_WINDOWS TRUE)
|
set(OS_WINDOWS TRUE)
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
@ -105,7 +105,7 @@ endif()
|
|||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
target_sources(usb PRIVATE
|
target_sources(usb PRIVATE
|
||||||
libusb/libusb/os/poll_posix.c
|
libusb/libusb/os/events_posix.c
|
||||||
libusb/libusb/os/threads_posix.c
|
libusb/libusb/os/threads_posix.c
|
||||||
)
|
)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
@ -118,7 +118,7 @@ if(UNIX)
|
|||||||
set(THREADS_POSIX TRUE)
|
set(THREADS_POSIX TRUE)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
target_sources(usb PRIVATE
|
target_sources(usb PRIVATE
|
||||||
libusb/libusb/os/poll_windows.c
|
libusb/libusb/os/events_windows.c
|
||||||
libusb/libusb/os/threads_windows.c
|
libusb/libusb/os/threads_windows.c
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
2
externals/libusb/libusb
vendored
2
externals/libusb/libusb
vendored
@ -1 +1 @@
|
|||||||
Subproject commit e782eeb2514266f6738e242cdcb18e3ae1ed06fa
|
Subproject commit c6a35c56016ea2ab2f19115d2ea1e85e0edae155
|
Loading…
Reference in New Issue
Block a user