From 800d98d2127dad72bcac2a1dfcd47197dd29923e Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 4 Oct 2025 21:00:35 -0400 Subject: [PATCH] allow system libusb on solaris Signed-off-by: crueter --- docs/Deps.md | 2 +- externals/libusb/CMakeLists.txt | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/docs/Deps.md b/docs/Deps.md index 69f41794ea..b8a1be66d2 100644 --- a/docs/Deps.md +++ b/docs/Deps.md @@ -195,7 +195,7 @@ Run the usual update + install of essential toolings: `sudo pkg update && sudo p - **gcc**: `sudo pkg install developer/gcc-14`. - **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`. -Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`. +Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 77a762d070..a53464ea98 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -6,18 +6,7 @@ include(CPMUtil) -# we love our libraries don't we folks -if (PLATFORM_SUN) - set(libusb_bundled ON) -else() - set(libusb_bundled OFF) -endif() - -# TODO(crueter): Fix on Solaris -AddJsonPackage( - NAME libusb - BUNDLED_PACKAGE ${libusb_bundled} -) +AddJsonPackage(libusb) if (NOT libusb_ADDED) return()