diff --git a/src/gui/wxgui/CMakeLists.txt b/src/gui/wxgui/CMakeLists.txt index 12fc62d9..a5d851de 100644 --- a/src/gui/wxgui/CMakeLists.txt +++ b/src/gui/wxgui/CMakeLists.txt @@ -76,6 +76,8 @@ add_library(CemuWxGui STATIC input/InputAPIAddWindow.h input/InputSettings2.cpp input/InputSettings2.h + input/PairingDialog.cpp + input/PairingDialog.h input/panels/ClassicControllerInputPanel.cpp input/panels/ClassicControllerInputPanel.h input/panels/InputPanel.cpp @@ -124,10 +126,7 @@ if (ENABLE_METAL) endif() if (ENABLE_BLUEZ) - target_sources(CemuWxGui PRIVATE - input/PairingDialog.cpp - input/PairingDialog.h - ) + target_compile_definitions(CemuWxGui PRIVATE HAS_BLUEZ) endif() set_property(TARGET CemuWxGui PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/gui/wxgui/input/InputSettings2.cpp b/src/gui/wxgui/input/InputSettings2.cpp index d77e1430..1370bf07 100644 --- a/src/gui/wxgui/input/InputSettings2.cpp +++ b/src/gui/wxgui/input/InputSettings2.cpp @@ -21,9 +21,7 @@ #include "wxgui/input/InputAPIAddWindow.h" #include "input/ControllerFactory.h" -#ifdef HAS_BLUEZ #include "wxgui/input/PairingDialog.h" -#endif #include "wxgui/input/panels/VPADInputPanel.h" #include "wxgui/input/panels/ProControllerInputPanel.h" @@ -257,14 +255,12 @@ wxWindow* InputSettings2::initialize_page(size_t index) page_data.m_controller_api_remove = remove_api; } -#ifdef HAS_BLUEZ auto* pairingDialog = new wxButton(page, wxID_ANY, _("Pair Wii/Wii U Controller")); pairingDialog->Bind(wxEVT_BUTTON, [this](wxEvent&) { PairingDialog pairing_dialog(this); pairing_dialog.ShowModal(); }); sizer->Add(pairingDialog, wxGBPosition(5, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); -#endif // controller auto* controller_bttns = new wxBoxSizer(wxHORIZONTAL); diff --git a/src/gui/wxgui/input/PairingDialog.cpp b/src/gui/wxgui/input/PairingDialog.cpp index 9bf2870f..1ac4254a 100644 --- a/src/gui/wxgui/input/PairingDialog.cpp +++ b/src/gui/wxgui/input/PairingDialog.cpp @@ -4,7 +4,7 @@ #if BOOST_OS_WINDOWS #include #endif -#if BOOST_OS_LINUX +#ifdef HAS_BLUEZ #include #include #include