aboutsummaryrefslogtreecommitdiffhomepage
path: root/externals/libusb
diff options
context:
space:
mode:
authorliushuyu <[email protected]>2023-10-21 13:58:58 -0600
committerliushuyu <[email protected]>2023-10-21 22:29:32 -0600
commitd6bd16b2c0ada1d08649b24598f4fd4b8fd65423 (patch)
tree08a14e4e354bef44736f31d00edff152fcb653fe /externals/libusb
parenta49b146ccc90b96c024fe18953f08a936cf25f1a (diff)
downloadyuzu-android-d6bd16b2c0ada1d08649b24598f4fd4b8fd65423.tar.gz
yuzu-android-d6bd16b2c0ada1d08649b24598f4fd4b8fd65423.zip
externals/libusb: remove the GUID override workaround ...
... on Windows MSVC, it seems to have been fixed
Diffstat (limited to 'externals/libusb')
-rw-r--r--externals/libusb/CMakeLists.txt7
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)
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