From ec1214dac177af418fccce17efeec0f1cc4f29b2 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Mon, 21 Jul 2025 00:15:38 +0300 Subject: [PATCH] added ext-libusb to overcome sysv_abi changes --- .gitmodules | 6 +++--- CMakeLists.txt | 1 - externals/CMakeLists.txt | 2 +- externals/ext-libusb | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 externals/ext-libusb diff --git a/.gitmodules b/.gitmodules index 25b5d307b..a07201fa8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 24a81243f..7a7bd8e1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 89b0fbfdd..1296c8db7 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -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() diff --git a/externals/ext-libusb b/externals/ext-libusb new file mode 160000 index 000000000..e1f4ac147 --- /dev/null +++ b/externals/ext-libusb @@ -0,0 +1 @@ +Subproject commit e1f4ac1472bdf6aab27f8b836a2f47df85465bac