diff options
| author | Franco M <francomaro@gmail.com> | 2023-11-04 21:28:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 21:28:16 -0300 |
| commit | 728aca770317b3f86961c8669ba9ae5c68570d3f (patch) | |
| tree | 29adffcb1d264cc16cacb478a8f6645ef6259b3b /externals/libusb | |
| parent | 7f62a48ab507d3874378c10944662d5b841c6c2e (diff) | |
| parent | 940618a64dc048790291e240dca6a085a4f1c27c (diff) | |
Merge branch 'master' into new-shortcut
Diffstat (limited to 'externals/libusb')
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 7 | ||||
| m--------- | externals/libusb/libusb | 0 |
2 files changed, 0 insertions, 7 deletions
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 6757b59da..1d50c9f8c 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -49,11 +49,6 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE) set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE) - # 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. - 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}") add_custom_command( @@ -146,8 +141,6 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") target_include_directories(usb BEFORE PRIVATE libusb/msvc) endif() - # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2) - target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}") else() target_include_directories(usb # turns out other projects also have "config.h", so make sure the diff --git a/externals/libusb/libusb b/externals/libusb/libusb -Subproject c6a35c56016ea2ab2f19115d2ea1e85e0edae15 +Subproject c060e9ce30ac2e3ffb49d94209c4dae77b6642f |