yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

externals: libusb: Link libusb statically on Linux 

Turns out that this is possible. Also addresses my own review comment.
This commit is contained in:
lat9nq 2021-06-03 04:38:29 -04:00
parent ddc47e6df8
commit 890acfa2c0
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -430,13 +430,13 @@ if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB)
find_package(LibUSB) find_package(LibUSB)
endif() endif()
if (NOT LIBUSB_FOUND) if (LIBUSB_FOUND)
message(WARNING "libusb not found, falling back to externals")
set(YUZU_USE_BUNDLED_LIBUSB ON)
else()
add_library(usb INTERFACE) add_library(usb INTERFACE)
target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}") target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}")
target_link_libraries(usb INTERFACE "${LIBUSB_LIBRARIES}") target_link_libraries(usb INTERFACE "${LIBUSB_LIBRARIES}")
else()
message(WARNING "libusb not found, falling back to externals")
set(YUZU_USE_BUNDLED_LIBUSB ON)
endif() endif()
endif() endif()

22
externals/libusb/CMakeLists.txt vendored
View File

@ -30,15 +30,15 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
set(LIBUSB_CONFIGURE_ARGS --host=x86_64-w64-mingw32 --build=x86_64-windows) set(LIBUSB_CONFIGURE_ARGS --host=x86_64-w64-mingw32 --build=x86_64-windows)
else() else()
set(LIBUSB_LIBRARIES "${LIBUSB_PREFIX}/libusb/.libs/libusb-1.0.so" CACHE PATH "libusb library path" FORCE) set(LIBUSB_LIBRARIES "${LIBUSB_PREFIX}/libusb/.libs/libusb-1.0.a" CACHE PATH "libusb library path" FORCE)
set(LIBUSB_SHARED_LIBRARY "${LIBUSB_LIBRARIES}")
set(LIBUSB_SHARED_LIBRARY_DEST "${CMAKE_BINARY_DIR}/bin/libusb-1.0.so")
endif() endif()
set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE) set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE)
# Causes "externals/libusb/libusb/libusb/os/windows_winusb.c:1427:2: error: conversion to non-scalar type requested", so cannot statically link it for now. # MINGW: causes "externals/libusb/libusb/libusb/os/windows_winusb.c:1427:2: error: conversion to non-scalar type requested", so cannot statically link it for now.
# set(LIBUSB_CFLAGS "-DGUID_DEVINTERFACE_USB_DEVICE=\\(GUID\\){0xA5DCBF10,0x6530,0x11D2,{0x90,0x1F,0x00,0xC0,0x4F,0xB9,0x51,0xED}}") if (NOT MINGW)
set(LIBUSB_CFLAGS "-DGUID_DEVINTERFACE_USB_DEVICE=\\(GUID\\){0xA5DCBF10,0x6530,0x11D2,{0x90,0x1F,0x00,0xC0,0x4F,0xB9,0x51,0xED}}")
endif()
make_directory("${LIBUSB_PREFIX}") make_directory("${LIBUSB_PREFIX}")
@ -55,8 +55,8 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
OUTPUT OUTPUT
"${LIBUSB_MAKEFILE}" "${LIBUSB_MAKEFILE}"
COMMAND COMMAND
# /bin/env /bin/env
# CFLAGS="${LIBUSB_CFLAGS}" CFLAGS="${LIBUSB_CFLAGS}"
/bin/sh "${LIBUSB_CONFIGURE}" /bin/sh "${LIBUSB_CONFIGURE}"
${LIBUSB_CONFIGURE_ARGS} ${LIBUSB_CONFIGURE_ARGS}
--srcdir="${LIBUSB_SRC_DIR}" --srcdir="${LIBUSB_SRC_DIR}"
@ -92,10 +92,12 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}") target_include_directories(usb INTERFACE "${LIBUSB_INCLUDE_DIRS}")
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
find_package(Libudev QUIET) Include(FindPkgConfig)
pkg_check_modules(LIBUDEV REQUIRED libudev)
if (LIBUDEV_FOUND) if (LIBUDEV_FOUND)
target_link_libraries(usb INTERFACE "${LIBUDEV_LIBRARIES}") target_include_directories(usb INTERFACE "${LIBUDEV_INCLUDE_DIRS}")
target_include_directories(usb INTERFACE "${LIBUDEV_INCLUDE_DIR}") target_link_libraries(usb INTERFACE "${LIBUDEV_STATIC_LIBRARIES}")
endif() endif()
endif() endif()
else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")