mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-21 17:44:35 +00:00
Using custom usb lib (#3284)
* added ext-libusb to overcome sysv_abi changes * Fully remove libusb submodule
This commit is contained in:
parent
95a386308a
commit
a4c5fa4b5c
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -103,6 +103,6 @@
|
||||
path = externals/MoltenVK/cereal
|
||||
url = https://github.com/USCiLab/cereal
|
||||
shallow = true
|
||||
[submodule "externals/libusb"]
|
||||
path = externals/libusb
|
||||
url = https://github.com/libusb/libusb-cmake.git
|
||||
[submodule "externals/ext-libusb"]
|
||||
path = externals/ext-libusb
|
||||
url = https://github.com/shadps4-emu/ext-libusb.git
|
||||
|
@ -243,7 +243,6 @@ find_package(xxHash 0.8.2 MODULE)
|
||||
find_package(ZLIB 1.3 MODULE)
|
||||
find_package(Zydis 5.0.0 CONFIG)
|
||||
find_package(pugixml 1.14 CONFIG)
|
||||
find_package(libusb 1.0.27 MODULE)
|
||||
if (APPLE)
|
||||
find_package(date 3.0.1 CONFIG)
|
||||
endif()
|
||||
|
2
externals/CMakeLists.txt
vendored
2
externals/CMakeLists.txt
vendored
@ -197,7 +197,7 @@ endif()
|
||||
|
||||
# libusb
|
||||
if (NOT TARGET libusb::usb)
|
||||
add_subdirectory(libusb)
|
||||
add_subdirectory(ext-libusb)
|
||||
add_library(libusb::usb ALIAS usb-1.0)
|
||||
endif()
|
||||
|
||||
|
1
externals/ext-libusb
vendored
Submodule
1
externals/ext-libusb
vendored
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit e1f4ac1472bdf6aab27f8b836a2f47df85465bac
|
1
externals/libusb
vendored
1
externals/libusb
vendored
@ -1 +0,0 @@
|
||||
Subproject commit a63a7e43e0950a595cf4b98a0eaf4051749ace5f
|
Loading…
Reference in New Issue
Block a user