diff options
| author | bunnei <bunneidev@gmail.com> | 2020-09-02 21:44:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 21:44:56 -0400 |
| commit | abfdc3aa7d388a9c7f99bf412180a86a30312384 (patch) | |
| tree | 19f09d71d993c761d1e1e8f1800d8cdacf599534 | |
| parent | 0ee7c985da07bb745e769af99a860e1f78a69e14 (diff) | |
| parent | 91cbe521223bd0ba45134d04cd3d8db01f20e950 (diff) | |
Merge pull request #4625 from lioncash/libusb2
externals: Work around libusb duplicate GUID errors
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 074ce01d3..c0d24b126 100644 --- 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 |