From 7b45eae6e7278dfc693c134a74b7538750149af3 Mon Sep 17 00:00:00 2001 From: mathieui Date: Fri, 1 May 2015 17:56:15 +0200 Subject: [PATCH] Add missing ifdefs around GCAdapter code in Controller config Otherwise the build fails if libusb is not found --- Source/Core/DolphinWX/ControllerConfigDiag.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index df892e3eaa..48e963801e 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -200,12 +200,14 @@ void ControllerConfigDiag::ScheduleAdapterUpdate() void ControllerConfigDiag::UpdateAdapter(wxCommandEvent& ev) { +#if defined(__LIBUSB__) || defined (_WIN32) bool unpause = Core::PauseAndLock(true); if (SI_GCAdapter::IsDetected()) m_adapter_status->SetLabelText(_("Adapter Detected")); else m_adapter_status->SetLabelText(_("Adapter Not Detected")); Core::PauseAndLock(false, unpause); +#endif } wxStaticBoxSizer* ControllerConfigDiag::CreateWiimoteConfigSizer() @@ -568,5 +570,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) ControllerConfigDiag::~ControllerConfigDiag() { +#if defined(__LIBUSB__) || defined (_WIN32) SI_GCAdapter::SetAdapterCallback(nullptr); +#endif }