summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/ControllerConfigDiag.cpp
diff options
context:
space:
mode:
authorMarkus Wick <markus+github@selfnet.de>2015-05-01 18:27:48 +0200
committerMarkus Wick <markus+github@selfnet.de>2015-05-01 18:27:48 +0200
commit1eb901ff6417478bc23997ff0a136924bea5c5ba (patch)
treeb5321d69266d3b7c42067a1c1cb5dd1146e1d2c1 /Source/Core/DolphinWX/ControllerConfigDiag.cpp
parent9348b2e1a661d7e430e70107569ec274e70a1c19 (diff)
parent7b45eae6e7278dfc693c134a74b7538750149af3 (diff)
Merge pull request #2354 from mathieui/build-without-libusb
Add missing ifdefs around GCAdapter code in Controller config
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
-rw-r--r--Source/Core/DolphinWX/ControllerConfigDiag.cpp4
1 files changed, 4 insertions, 0 deletions
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
}