diff --git a/src/Cafe/HW/Espresso/Debugger/Debugger.cpp b/src/Cafe/HW/Espresso/Debugger/Debugger.cpp index b6417080..f7361405 100644 --- a/src/Cafe/HW/Espresso/Debugger/Debugger.cpp +++ b/src/Cafe/HW/Espresso/Debugger/Debugger.cpp @@ -4,8 +4,6 @@ #include "Cafe/HW/Espresso/Recompiler/PPCRecompiler.h" #include "Cemu/ExpressionParser/ExpressionParser.h" -#include "gui/debugger/DebuggerWindow2.h" - #include "Cafe/OS/libs/coreinit/coreinit.h" #if BOOST_OS_WINDOWS diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h b/src/Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h new file mode 100644 index 00000000..cb4665a5 --- /dev/null +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/GLCanvas.h @@ -0,0 +1,5 @@ +#pragma once + +bool GLCanvas_MakeCurrent(bool padView); +void GLCanvas_SwapBuffers(bool swapTV, bool swapDRC); +bool GLCanvas_HasPadViewOpen(); diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp index 4dfdc52b..7a92f9f9 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp @@ -19,7 +19,7 @@ #include "Cafe/HW/Latte/ISA/RegDefines.h" #include "Cafe/OS/libs/gx2/GX2.h" -#include "gui/canvas/OpenGLCanvas.h" +#include "GLCanvas.h" #define STRINGIFY2(X) #X #define STRINGIFY(X) STRINGIFY2(X) diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp index 6ccca80f..cbbed5fb 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.cpp @@ -1,5 +1,3 @@ -#include "gui/MainWindow.h" - #if BOOST_OS_WINDOWS #include diff --git a/src/Cafe/IOSU/legacy/iosu_act.cpp b/src/Cafe/IOSU/legacy/iosu_act.cpp index c830fc4f..d6e592ed 100644 --- a/src/Cafe/IOSU/legacy/iosu_act.cpp +++ b/src/Cafe/IOSU/legacy/iosu_act.cpp @@ -2,7 +2,6 @@ #include "iosu_ioctl.h" #include "Cafe/OS/libs/nn_common.h" -#include "gui/CemuApp.h" #include #include diff --git a/src/Cafe/OS/libs/erreula/erreula.cpp b/src/Cafe/OS/libs/erreula/erreula.cpp index e8b82c2f..751294c0 100644 --- a/src/Cafe/OS/libs/erreula/erreula.cpp +++ b/src/Cafe/OS/libs/erreula/erreula.cpp @@ -6,8 +6,6 @@ #include #include "imgui/imgui_extension.h" -#include - #include "Cafe/OS/libs/coreinit/coreinit_FS.h" #include "Cafe/OS/libs/vpad/vpad.h" diff --git a/src/Cafe/OS/libs/padscore/padscore.cpp b/src/Cafe/OS/libs/padscore/padscore.cpp index 5c1203bf..1d447343 100644 --- a/src/Cafe/OS/libs/padscore/padscore.cpp +++ b/src/Cafe/OS/libs/padscore/padscore.cpp @@ -1,6 +1,6 @@ #include "Cafe/OS/common/OSCommon.h" #include "Cafe/HW/Espresso/PPCCallback.h" -#include "gui/wxgui.h" +#include "gui/guiWrapper.h" #include "Cafe/OS/libs/padscore/padscore.h" #include "Cafe/OS/libs/coreinit/coreinit_Time.h" #include "Cafe/OS/libs/coreinit/coreinit_Alarm.h" diff --git a/src/Cafe/OS/libs/vpad/vpad.cpp b/src/Cafe/OS/libs/vpad/vpad.cpp index d869eef1..2ac47c96 100644 --- a/src/Cafe/OS/libs/vpad/vpad.cpp +++ b/src/Cafe/OS/libs/vpad/vpad.cpp @@ -1,6 +1,6 @@ #include "Cafe/OS/common/OSCommon.h" #include "Cafe/HW/Espresso/PPCCallback.h" -#include "gui/wxgui.h" +#include "gui/guiWrapper.h" #include "Cafe/OS/libs/vpad/vpad.h" #include "audio/IAudioAPI.h" #include "Cafe/OS/libs/coreinit/coreinit_Time.h" diff --git a/src/Cemu/Logging/CemuLogging.cpp b/src/Cemu/Logging/CemuLogging.cpp index ed8441a7..8203abd7 100644 --- a/src/Cemu/Logging/CemuLogging.cpp +++ b/src/Cemu/Logging/CemuLogging.cpp @@ -1,6 +1,6 @@ #include "CemuLogging.h" #include "config/CemuConfig.h" -#include "gui/LoggingWindow.h" +#include "gui/guiWrapper.h" #include "config/ActiveSettings.h" #include "util/helpers/helpers.h" @@ -158,9 +158,9 @@ bool cemuLog_log(LogType type, std::string_view text) const auto it = std::find_if(g_logging_window_mapping.cbegin(), g_logging_window_mapping.cend(), [type](const auto& entry) { return entry.first == type; }); if (it == g_logging_window_mapping.cend()) - LoggingWindow::Log(text); + gui_loggingWindowLog(text); else - LoggingWindow::Log(it->second, text); + gui_loggingWindowLog(it->second, text); return true; } diff --git a/src/Cemu/Tools/DownloadManager/DownloadManager.cpp b/src/Cemu/Tools/DownloadManager/DownloadManager.cpp index bb8eaa92..e355936b 100644 --- a/src/Cemu/Tools/DownloadManager/DownloadManager.cpp +++ b/src/Cemu/Tools/DownloadManager/DownloadManager.cpp @@ -1,7 +1,7 @@ #include "Cemu/Tools/DownloadManager/DownloadManager.h" #include "Cafe/Account/Account.h" -#include "gui/CemuApp.h" +#include "gui/guiWrapper.h" #include "util/crypto/md5.h" #include "Cafe/TitleList/TitleId.h" #include "Common/FileStream.h" @@ -10,7 +10,6 @@ #include "config/ActiveSettings.h" #include "util/ThreadPool/ThreadPool.h" #include "util/helpers/enum_array.hpp" -#include "gui/MainWindow.h" #include "Cafe/Filesystem/FST/FST.h" #include "Cafe/TitleList/TitleList.h" @@ -20,15 +19,16 @@ #include #include -#include "gui/helpers/wxHelpers.h" - #include "Cemu/napi/napi.h" #include "util/helpers/Serializer.h" FileCache* s_nupFileCache = nullptr; -/* version list */ +// Todo: replace this +std::string _(const std::string& str) { return str; } +std::string from_wxString(const std::string& str){ return str; } +/* version list */ void DownloadManager::downloadTitleVersionList() { if (m_hasTitleVersionList) @@ -371,7 +371,7 @@ bool DownloadManager::syncAccountTickets() for (auto& tiv : resultTicketIds.tivs) { index++; - std::string msg = _("Downloading account ticket").ToStdString(); + std::string msg = _("Downloading account ticket"); msg.append(fmt::format(" {0}/{1}", index, count)); setStatusMessage(msg, DLMGR_STATUS_CODE::CONNECTING); // skip if already cached @@ -508,7 +508,7 @@ bool DownloadManager::syncUpdateTickets() if (titleIdParser.GetType() != TitleIdParser::TITLE_TYPE::BASE_TITLE_UPDATE) continue; - std::string msg = _("Downloading ticket").ToStdString(); + std::string msg = _("Downloading ticket"); msg.append(fmt::format(" {0}/{1}", updateIndex, numUpdates)); updateIndex++; setStatusMessage(msg, DLMGR_STATUS_CODE::CONNECTING); @@ -561,7 +561,7 @@ bool DownloadManager::syncTicketCache() for (auto& ticketInfo : m_ticketCache) { index++; - std::string msg = _("Downloading meta data").ToStdString(); + std::string msg = _("Downloading meta data"); msg.append(fmt::format(" {0}/{1}", index, count)); setStatusMessage(msg, DLMGR_STATUS_CODE::CONNECTING); prepareIDBE(ticketInfo.titleId); @@ -1449,7 +1449,7 @@ void DownloadManager::asyncPackageInstall(Package* package) reportPackageStatus(package); checkPackagesState(); // lastly request game list to be refreshed - MainWindow::RequestGameListRefresh(); + gui_requestGameListRefresh(); return; } diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt index f02b95d4..c531e288 100644 --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -27,9 +27,3 @@ target_link_libraries(CemuConfig PRIVATE Boost::program_options pugixml::pugixml ) - -if (ENABLE_WXWIDGETS) - # PUBLIC because wx/language.h is included in CemuConfig.h - # Could be made PRIVATE by using 0 instead of wxLANGUAGE_DEFAULT - target_link_libraries(CemuConfig PUBLIC wx::base wx::core) -endif() diff --git a/src/config/CemuConfig.cpp b/src/config/CemuConfig.cpp index 5d99a23d..8938da3e 100644 --- a/src/config/CemuConfig.cpp +++ b/src/config/CemuConfig.cpp @@ -3,8 +3,6 @@ #include "util/helpers/helpers.h" #include "config/ActiveSettings.h" -#include - #include "PermanentConfig.h" #include "ActiveSettings.h" @@ -50,7 +48,7 @@ void CemuConfig::Load(XMLConfigParser& parser) permanent_storage = parser.get("permanent_storage", permanent_storage); - language = parser.get("language", wxLANGUAGE_DEFAULT); + language = parser.get("language", 0); use_discord_presence = parser.get("use_discord_presence", true); fullscreen_menubar = parser.get("fullscreen_menubar", false); feral_gamemode = parser.get("feral_gamemode", false); diff --git a/src/config/CemuConfig.h b/src/config/CemuConfig.h index e17a9344..f3836a9c 100644 --- a/src/config/CemuConfig.h +++ b/src/config/CemuConfig.h @@ -5,8 +5,6 @@ #include "util/math/vector2.h" #include "Cafe/Account/Account.h" -#include - struct GameEntry { GameEntry() = default; @@ -361,7 +359,7 @@ struct CemuConfig ConfigValue permanent_storage{ true }; - ConfigValue language{ wxLANGUAGE_DEFAULT }; + ConfigValue language{ 0 }; ConfigValue use_discord_presence{ true }; ConfigValue mlc_path {}; ConfigValue fullscreen_menubar{ false }; diff --git a/src/gui/guiWrapper.h b/src/gui/guiWrapper.h index 396a4823..90d2ffae 100644 --- a/src/gui/guiWrapper.h +++ b/src/gui/guiWrapper.h @@ -2,15 +2,6 @@ #include -#if BOOST_OS_LINUX -#include "xcb/xproto.h" -#include -#endif - -#if BOOST_OS_MACOS -#include -#endif - struct WindowHandleInfo { #if BOOST_OS_WINDOWS @@ -39,23 +30,9 @@ struct WindowHandleInfo enum struct PlatformKeyCodes : uint32 { -#if BOOST_OS_WINDOWS - LCONTROL = VK_LCONTROL, - RCONTROL = VK_RCONTROL, - TAB = VK_TAB, -#elif BOOST_OS_LINUX - LCONTROL = GDK_KEY_Control_L, - RCONTROL = GDK_KEY_Control_R, - TAB = GDK_KEY_Tab, -#elif BOOST_OS_MACOS - LCONTROL = kVK_Control, - RCONTROL = kVK_RightControl, - TAB = kVK_Tab, -#else - LCONTROL = 0, - RCONTROL = 0, - TAB = 0, -#endif + LCONTROL, + RCONTROL, + TAB }; struct WindowInfo @@ -118,6 +95,11 @@ struct WindowInfo std::unordered_map m_keydown; }; +extern bool g_inputConfigWindowHasFocus; + +void gui_loggingWindowLog(std::string_view filter, std::string_view message); +void gui_loggingWindowLog(std::string_view message); + void gui_create(); WindowInfo& gui_getWindowInfo(); @@ -140,6 +122,8 @@ bool gui_isFullScreen(); void gui_initHandleContextFromWxWidgetsWindow(WindowHandleInfo& handleInfoOut, class wxWindow* wxw); +void gui_requestGameListRefresh(); + std::string gui_RawKeyCodeToString(uint32 keyCode); bool gui_saveScreenshotToFile(const fs::path& imagePath, std::vector& data, int width, int height); diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt index ecb88cd2..8fc29044 100644 --- a/src/input/CMakeLists.txt +++ b/src/input/CMakeLists.txt @@ -87,7 +87,3 @@ target_link_libraries(CemuInput PRIVATE pugixml::pugixml SDL2::SDL2 ) - -if (ENABLE_WXWIDGETS) - target_link_libraries(CemuInput PRIVATE wx::base wx::core) -endif() diff --git a/src/input/emulated/ClassicController.cpp b/src/input/emulated/ClassicController.cpp index 5a3bdb43..e218cded 100644 --- a/src/input/emulated/ClassicController.cpp +++ b/src/input/emulated/ClassicController.cpp @@ -3,8 +3,6 @@ #include "input/api/Controller.h" #include "input/api/SDL/SDLController.h" -#include - ClassicController::ClassicController(size_t player_index) : WPADController(player_index, kDataFormat_CLASSIC) { @@ -70,22 +68,22 @@ std::string_view ClassicController::get_button_name(ButtonId id) case kButtonId_Plus: return "+"; case kButtonId_Minus: return "-"; - case kButtonId_Home: return wxTRANSLATE("home"); + case kButtonId_Home: return "home"; - case kButtonId_Up: return wxTRANSLATE("up"); - case kButtonId_Down: return wxTRANSLATE("down"); - case kButtonId_Left: return wxTRANSLATE("left"); - case kButtonId_Right: return wxTRANSLATE("right"); + case kButtonId_Up: return "up"; + case kButtonId_Down: return "down"; + case kButtonId_Left: return "left"; + case kButtonId_Right: return "right"; - case kButtonId_StickL_Up: return wxTRANSLATE("up"); - case kButtonId_StickL_Down: return wxTRANSLATE("down"); - case kButtonId_StickL_Left: return wxTRANSLATE("left"); - case kButtonId_StickL_Right: return wxTRANSLATE("right"); + case kButtonId_StickL_Up: return "up"; + case kButtonId_StickL_Down: return "down"; + case kButtonId_StickL_Left: return "left"; + case kButtonId_StickL_Right: return "right"; - case kButtonId_StickR_Up: return wxTRANSLATE("up"); - case kButtonId_StickR_Down: return wxTRANSLATE("down"); - case kButtonId_StickR_Left: return wxTRANSLATE("left"); - case kButtonId_StickR_Right: return wxTRANSLATE("right"); + case kButtonId_StickR_Up: return "up"; + case kButtonId_StickR_Down: return "down"; + case kButtonId_StickR_Left: return "left"; + case kButtonId_StickR_Right: return "right"; default: return ""; diff --git a/src/input/emulated/ProController.cpp b/src/input/emulated/ProController.cpp index a546cde8..521f88b2 100644 --- a/src/input/emulated/ProController.cpp +++ b/src/input/emulated/ProController.cpp @@ -3,8 +3,6 @@ #include "input/api/Controller.h" #include "input/api/SDL/SDLController.h" -#include - ProController::ProController(size_t player_index) : WPADController(player_index, kDataFormat_URCC) { @@ -75,21 +73,21 @@ std::string_view ProController::get_button_name(ButtonId id) case kButtonId_ZR: return "ZR"; case kButtonId_Plus: return "+"; case kButtonId_Minus: return "-"; - case kButtonId_Up: return wxTRANSLATE("up"); - case kButtonId_Down: return wxTRANSLATE("down"); - case kButtonId_Left: return wxTRANSLATE("left"); - case kButtonId_Right: return wxTRANSLATE("right"); - case kButtonId_StickL: return wxTRANSLATE("click"); - case kButtonId_StickR: return wxTRANSLATE("click"); - case kButtonId_StickL_Up: return wxTRANSLATE("up"); - case kButtonId_StickL_Down: return wxTRANSLATE("down"); - case kButtonId_StickL_Left: return wxTRANSLATE("left"); - case kButtonId_StickL_Right: return wxTRANSLATE("right"); - case kButtonId_StickR_Up: return wxTRANSLATE("up"); - case kButtonId_StickR_Down: return wxTRANSLATE("down"); - case kButtonId_StickR_Left: return wxTRANSLATE("left"); - case kButtonId_StickR_Right: return wxTRANSLATE("right"); - case kButtonId_Home: return wxTRANSLATE("home"); + case kButtonId_Up: return "up"; + case kButtonId_Down: return "down"; + case kButtonId_Left: return "left"; + case kButtonId_Right: return "right"; + case kButtonId_StickL: return "click"; + case kButtonId_StickR: return "click"; + case kButtonId_StickL_Up: return "up"; + case kButtonId_StickL_Down: return "down"; + case kButtonId_StickL_Left: return "left"; + case kButtonId_StickL_Right: return "right"; + case kButtonId_StickR_Up: return "up"; + case kButtonId_StickR_Down: return "down"; + case kButtonId_StickR_Left: return "left"; + case kButtonId_StickR_Right: return "right"; + case kButtonId_Home: return "home"; default: cemu_assert_debug(false); return ""; diff --git a/src/input/emulated/VPADController.cpp b/src/input/emulated/VPADController.cpp index aeb56395..eff221ef 100644 --- a/src/input/emulated/VPADController.cpp +++ b/src/input/emulated/VPADController.cpp @@ -5,7 +5,6 @@ #include "input/InputManager.h" #include "Cafe/HW/Latte/Core/Latte.h" #include "Cafe/CafeSystem.h" -#include enum ControllerVPADMapping2 : uint32 { @@ -367,21 +366,21 @@ std::string_view VPADController::get_button_name(ButtonId id) case kButtonId_ZR: return "ZR"; case kButtonId_Plus: return "+"; case kButtonId_Minus: return "-"; - case kButtonId_Up: return wxTRANSLATE("up"); - case kButtonId_Down: return wxTRANSLATE("down"); - case kButtonId_Left: return wxTRANSLATE("left"); - case kButtonId_Right: return wxTRANSLATE("right"); - case kButtonId_StickL: return wxTRANSLATE("click"); - case kButtonId_StickR: return wxTRANSLATE("click"); - case kButtonId_StickL_Up: return wxTRANSLATE("up"); - case kButtonId_StickL_Down: return wxTRANSLATE("down"); - case kButtonId_StickL_Left: return wxTRANSLATE("left"); - case kButtonId_StickL_Right: return wxTRANSLATE("right"); - case kButtonId_StickR_Up: return wxTRANSLATE("up"); - case kButtonId_StickR_Down: return wxTRANSLATE("down"); - case kButtonId_StickR_Left: return wxTRANSLATE("left"); - case kButtonId_StickR_Right: return wxTRANSLATE("right"); - case kButtonId_Home: return wxTRANSLATE("home"); + case kButtonId_Up: return "up"; + case kButtonId_Down: return "down"; + case kButtonId_Left: return "left"; + case kButtonId_Right: return "right"; + case kButtonId_StickL: return "click"; + case kButtonId_StickR: return "click"; + case kButtonId_StickL_Up: return "up"; + case kButtonId_StickL_Down: return "down"; + case kButtonId_StickL_Left: return "left"; + case kButtonId_StickL_Right: return "right"; + case kButtonId_StickR_Up: return "up"; + case kButtonId_StickR_Down: return "down"; + case kButtonId_StickR_Left: return "left"; + case kButtonId_StickR_Right: return "right"; + case kButtonId_Home: return "home"; default: cemu_assert_debug(false); return ""; diff --git a/src/input/emulated/WPADController.h b/src/input/emulated/WPADController.h index 2636b74a..39df5098 100644 --- a/src/input/emulated/WPADController.h +++ b/src/input/emulated/WPADController.h @@ -1,7 +1,5 @@ #pragma once -#include - #include "input/emulated/EmulatedController.h" #include "Cafe/OS/libs/padscore/padscore.h" #include "Cafe/OS/libs/vpad/vpad.h" diff --git a/src/input/emulated/WiimoteController.cpp b/src/input/emulated/WiimoteController.cpp index b090088e..578a9527 100644 --- a/src/input/emulated/WiimoteController.cpp +++ b/src/input/emulated/WiimoteController.cpp @@ -2,7 +2,6 @@ #include "input/api/Controller.h" #include "input/api/Wiimote/NativeWiimoteController.h" -#include WiimoteController::WiimoteController(size_t player_index) : WPADController(player_index, kDataFormat_CORE_ACC_DPD) @@ -159,22 +158,22 @@ std::string_view WiimoteController::get_button_name(ButtonId id) case kButtonId_1: return "1"; case kButtonId_2: return "2"; - case kButtonId_Home: return wxTRANSLATE("home"); + case kButtonId_Home: return "home"; case kButtonId_Plus: return "+"; case kButtonId_Minus: return "-"; - case kButtonId_Up: return wxTRANSLATE("up"); - case kButtonId_Down: return wxTRANSLATE("down"); - case kButtonId_Left: return wxTRANSLATE("left"); - case kButtonId_Right: return wxTRANSLATE("right"); + case kButtonId_Up: return "up"; + case kButtonId_Down: return "down"; + case kButtonId_Left: return "left"; + case kButtonId_Right: return "right"; case kButtonId_Nunchuck_Z: return "Z"; case kButtonId_Nunchuck_C: return "C"; - case kButtonId_Nunchuck_Up: return wxTRANSLATE("up"); - case kButtonId_Nunchuck_Down: return wxTRANSLATE("down"); - case kButtonId_Nunchuck_Left: return wxTRANSLATE("left"); - case kButtonId_Nunchuck_Right: return wxTRANSLATE("right"); + case kButtonId_Nunchuck_Up: return "up"; + case kButtonId_Nunchuck_Down: return "down"; + case kButtonId_Nunchuck_Left: return "left"; + case kButtonId_Nunchuck_Right: return "right"; default: return ""; diff --git a/src/main.cpp b/src/main.cpp index 2d281d88..aba8c811 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,5 @@ #include "gui/guiWrapper.h" -#include "gui/wxgui.h" #include "util/crypto/aes128.h" -#include "gui/MainWindow.h" #include "Cafe/OS/RPL/rpl.h" #include "Cafe/OS/RPL/rpl_symbol_storage.h" #include "Cafe/OS/libs/gx2/GX2.h" @@ -9,7 +7,6 @@ #include "Cafe/GraphicPack/GraphicPack2.h" #include "config/CemuConfig.h" #include "config/NetworkSettings.h" -#include "gui/CemuApp.h" #include "Cafe/HW/Latte/Core/LatteOverlay.h" #include "config/LaunchSettings.h" #include "Cafe/OS/libs/coreinit/coreinit_Thread.h" @@ -21,7 +18,6 @@ #include "Common/ExceptionHandler/ExceptionHandler.h" #include "Common/cpu_features.h" -#include #include "util/helpers/helpers.h" #include "config/ActiveSettings.h" #include "Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.h" diff --git a/src/mainLLE.cpp b/src/mainLLE.cpp index 2b7c18a0..ac100ccc 100644 --- a/src/mainLLE.cpp +++ b/src/mainLLE.cpp @@ -1,6 +1,4 @@ -#include "gui/wxgui.h" #include "util/crypto/aes128.h" -#include "gui/MainWindow.h" #include "gui/guiWrapper.h" #include "Common/FileStream.h" diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 5af88176..f1bb09a6 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -97,7 +97,3 @@ target_link_libraries(CemuUtil PRIVATE Boost::nowide OpenSSL::Crypto ) - -if (ENABLE_WXWIDGETS) - target_link_libraries(CemuUtil PRIVATE wx::base wx::core) -endif() diff --git a/src/util/helpers/helpers.cpp b/src/util/helpers/helpers.cpp index b556db36..986933d5 100644 --- a/src/util/helpers/helpers.cpp +++ b/src/util/helpers/helpers.cpp @@ -5,8 +5,6 @@ #include #include -#include - #include "config/ActiveSettings.h" #include diff --git a/src/util/math/quaternion.h b/src/util/math/quaternion.h index 764cc44c..3c40d1ea 100644 --- a/src/util/math/quaternion.h +++ b/src/util/math/quaternion.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include "util/math/vector3.h" #define DEG2RAD(__d__) ((__d__ * M_PI) / 180.0f ) #define RAD2DEG(__r__) ((__r__ * 180.0f) / M_PI)