summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lioncash2020-09-02 19:30:20 -0400
committerGravatar Lioncash2020-09-02 19:32:19 -0400
commit91cbe521223bd0ba45134d04cd3d8db01f20e950 (patch)
treea41f801e22a614d1b4e5aa43c33351bdeecfb8e5
parentMerge pull request #4621 from Morph1984/use-pi (diff)
downloadyuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.gz
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.xz
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.zip
externals: Work around libusb duplicate GUID errors
Given we have two libraries that seem to use the same identifier, we can alter one of them so that the variable is used in place, effectively changing the used identifier, but without altering the source of libusb.
-rw-r--r--externals/libusb/CMakeLists.txt3
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)
21 if (NOT MINGW) 21 if (NOT MINGW)
22 target_include_directories(usb BEFORE PRIVATE libusb/msvc) 22 target_include_directories(usb BEFORE PRIVATE libusb/msvc)
23 endif() 23 endif()
24
25 # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2)
26 target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}")
24else() 27else()
25target_include_directories(usb 28target_include_directories(usb
26 # turns out other projects also have "config.h", so make sure the 29 # turns out other projects also have "config.h", so make sure the