mirrors/Cemu
0
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-12-12 01:36:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
mazes-80 2025-11-22 16:06:34 +01:00
parent 1382ee0381
commit 91fc1943be
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/gui/wxgui/CMakeLists.txt
View file

@ -76,8 +76,6 @@ add_library(CemuWxGui STATIC
input/InputAPIAddWindow.h input/InputAPIAddWindow.h
input/InputSettings2.cpp input/InputSettings2.cpp
input/InputSettings2.h input/InputSettings2.h
input/PairingDialog.cpp
input/PairingDialog.h
input/panels/ClassicControllerInputPanel.cpp input/panels/ClassicControllerInputPanel.cpp
input/panels/ClassicControllerInputPanel.h input/panels/ClassicControllerInputPanel.h
input/panels/InputPanel.cpp input/panels/InputPanel.cpp
@ -118,6 +116,13 @@ add_library(CemuWxGui STATIC
wxHelper.h 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>") set_property(TARGET CemuWxGui PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

4
src/gui/wxgui/input/InputSettings2.cpp
View file

@ -21,7 +21,9 @@
#include "wxgui/input/InputAPIAddWindow.h" #include "wxgui/input/InputAPIAddWindow.h"
#include "input/ControllerFactory.h" #include "input/ControllerFactory.h"
#ifdef HAS_BLUEZ
#include "wxgui/input/PairingDialog.h" #include "wxgui/input/PairingDialog.h"
#endif
#include "wxgui/input/panels/VPADInputPanel.h" #include "wxgui/input/panels/VPADInputPanel.h"
#include "wxgui/input/panels/ProControllerInputPanel.h" #include "wxgui/input/panels/ProControllerInputPanel.h"
@ -255,12 +257,14 @@ wxWindow* InputSettings2::initialize_page(size_t index)
page_data.m_controller_api_remove = remove_api; page_data.m_controller_api_remove = remove_api;
} }
#ifdef HAS_BLUEZ
auto* pairingDialog = new wxButton(page, wxID_ANY, _("Pair Wii/Wii U Controller")); auto* pairingDialog = new wxButton(page, wxID_ANY, _("Pair Wii/Wii U Controller"));
pairingDialog->Bind(wxEVT_BUTTON, [this](wxEvent&) { pairingDialog->Bind(wxEVT_BUTTON, [this](wxEvent&) {
PairingDialog pairing_dialog(this); PairingDialog pairing_dialog(this);
pairing_dialog.ShowModal(); pairing_dialog.ShowModal();
}); });
sizer->Add(pairingDialog, wxGBPosition(5, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); sizer->Add(pairingDialog, wxGBPosition(5, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5);
#endif
// controller // controller
auto* controller_bttns = new wxBoxSizer(wxHORIZONTAL); auto* controller_bttns = new wxBoxSizer(wxHORIZONTAL);