Merge pull request #4625 from lioncash/libusb2

externals: Work around libusb duplicate GUID errors
2020-09-02 21:44:56 +07:00 · 2020-09-02 21:44:56 +07:00 · abfdc3aa7d
parent 0ee7c985da 91cbe52122
commit abfdc3aa7d
1 changed files with 3 additions and 0 deletions
--- a/externals/libusb/CMakeLists.txt
+++ b/externals/libusb/CMakeLists.txt
@ -21,6 +21,9 @@ if(WIN32)
    if (NOT MINGW)
        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