Skip to content

gui: ENABLE_BLUEZ=OFF: bluetooth/bluetooth.h uneeded #1731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −2
Open

gui: ENABLE_BLUEZ=OFF: bluetooth/bluetooth.h uneeded #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/gui/wxgui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ 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
Expand Down Expand Up @@ -118,6 +116,13 @@ add_library(CemuWxGui STATIC
wxHelper.h
)

if (ENABLE_BLUEZ)
add_library(CemuWxGui STATIC
input/PairingDialog.cpp
input/PairingDialog.h
)
endif()

set_property(TARGET CemuWxGui PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")


Expand Down
4 changes: 4 additions & 0 deletions src/gui/wxgui/input/InputSettings2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
#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"
Expand Down Expand Up @@ -255,12 +257,14 @@ 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);
Expand Down