diff options
| author | 2023-10-21 13:58:58 -0600 | |
|---|---|---|
| committer | 2023-10-21 22:29:32 -0600 | |
| commit | d6bd16b2c0ada1d08649b24598f4fd4b8fd65423 (patch) | |
| tree | 08a14e4e354bef44736f31d00edff152fcb653fe | |
| parent | externals: update libusb to c060e9ce30ac2e3ffb49d94209c4dae77b6642f7 ... (diff) | |
| download | yuzu-d6bd16b2c0ada1d08649b24598f4fd4b8fd65423.tar.gz yuzu-d6bd16b2c0ada1d08649b24598f4fd4b8fd65423.tar.xz yuzu-d6bd16b2c0ada1d08649b24598f4fd4b8fd65423.zip | |
externals/libusb: remove the GUID override workaround ...
... on Windows MSVC, it seems to have been fixed
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 7 |
1 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) | |||
| 49 | 49 | ||
| 50 | set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE) | 50 | set(LIBUSB_INCLUDE_DIRS "${LIBUSB_SRC_DIR}/libusb" CACHE PATH "libusb headers path" FORCE) |
| 51 | 51 | ||
| 52 | # 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. | ||
| 53 | if (NOT MINGW) | ||
| 54 | set(LIBUSB_CFLAGS "-DGUID_DEVINTERFACE_USB_DEVICE=\\(GUID\\){0xA5DCBF10,0x6530,0x11D2,{0x90,0x1F,0x00,0xC0,0x4F,0xB9,0x51,0xED}}") | ||
| 55 | endif() | ||
| 56 | |||
| 57 | make_directory("${LIBUSB_PREFIX}") | 52 | make_directory("${LIBUSB_PREFIX}") |
| 58 | 53 | ||
| 59 | add_custom_command( | 54 | add_custom_command( |
| @@ -146,8 +141,6 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") | |||
| 146 | target_include_directories(usb BEFORE PRIVATE libusb/msvc) | 141 | target_include_directories(usb BEFORE PRIVATE libusb/msvc) |
| 147 | endif() | 142 | endif() |
| 148 | 143 | ||
| 149 | # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2) | ||
| 150 | target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}") | ||
| 151 | else() | 144 | else() |
| 152 | target_include_directories(usb | 145 | target_include_directories(usb |
| 153 | # turns out other projects also have "config.h", so make sure the | 146 | # turns out other projects also have "config.h", so make sure the |