Merge pull request #4625 from lioncash/libusb2
externals: Work around libusb duplicate GUID errors
This commit is contained in:
commit
abfdc3aa7d
1 changed files with 3 additions and 0 deletions
3
externals/libusb/CMakeLists.txt
vendored
3
externals/libusb/CMakeLists.txt
vendored
|
@ -21,6 +21,9 @@ if(WIN32)
|
||||||
if (NOT MINGW)
|
if (NOT MINGW)
|
||||||
target_include_directories(usb BEFORE PRIVATE libusb/msvc)
|
target_include_directories(usb BEFORE PRIVATE libusb/msvc)
|
||||||
endif()
|
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()
|
else()
|
||||||
target_include_directories(usb
|
target_include_directories(usb
|
||||||
# turns out other projects also have "config.h", so make sure the
|
# turns out other projects also have "config.h", so make sure the
|
||||||
|
|
Loading…
Reference in a new issue