From be716a680fdf36fb55d9300668d4db09a76e509b Mon Sep 17 00:00:00 2001 From: Greg V Date: Mon, 5 Feb 2018 00:46:59 +0300 Subject: [PATCH] Do not link to libusbhid on FreeBSD/NetBSD Both libusbhid (system library) and libhidapi (3rd party library) provide a function called hid_init. Dolphin was being linked to both. The WiimoteScannerHidapi constructor was calling hid_init without arguments. libusbhid's hid_init expects one argument (a file path). It was being called as if it was defined without arguments, which resulted in a garbage path being passed in, and because of that, the Qt GUI was failing to launch with the following error: 'dolphin-emu-qt2: @ : No such file or directory' --- CMakeLists.txt | 4 ---- Source/Core/VideoBackends/OGL/CMakeLists.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 568f9d62d2..8090ff1a2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -757,10 +757,6 @@ if(ENABLE_WX) endif() endif() -if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD") - set(LIBS ${LIBS} usbhid) -endif() - ######################################## # Pre-build events: Define configuration variables and write SCM info header # diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt index 9be7537704..8cd570c3c5 100644 --- a/Source/Core/VideoBackends/OGL/CMakeLists.txt +++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt @@ -23,8 +23,4 @@ set(LIBS ${LIBS} ${X11_LIBRARIES} ) -if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD") - set(LIBS ${LIBS} usbhid) -endif() - add_dolphin_library(videoogl "${SRCS}" "${LIBS}")