summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-09-03 01:30:20 +0200
committerLioncash <mathew1800@gmail.com>2020-09-03 01:32:19 +0200
commit91cbe521223bd0ba45134d04cd3d8db01f20e950 (patch)
treea41f801e22a614d1b4e5aa43c33351bdeecfb8e5
parentMerge pull request #4621 from Morph1984/use-pi (diff)
downloadyuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.gz
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.bz2
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.lz
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.xz
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.tar.zst
yuzu-91cbe521223bd0ba45134d04cd3d8db01f20e950.zip
-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)
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