UI+build: Isolate wxWidgets code from non-GUI code (#1633)

This commit is contained in:
SSimco 2025-07-15 05:28:41 +03:00 committed by GitHub
parent 5f3c2816ec
commit 67de63bed6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
199 changed files with 2414 additions and 2091 deletions

View file

@ -1,7 +1,5 @@
#include "gui/guiWrapper.h"
#include "gui/wxgui.h"
#include "WindowSystem.h"
#include "util/crypto/aes128.h"
#include "gui/MainWindow.h"
#include "Cafe/OS/RPL/rpl.h"
#include "Cafe/OS/libs/gx2/GX2.h"
#include "Cafe/OS/libs/coreinit/coreinit_Thread.h"
@ -11,7 +9,6 @@
#include "config/NetworkSettings.h"
#include "config/LaunchSettings.h"
#include "input/InputManager.h"
#include "gui/CemuApp.h"
#include "Cafe/CafeSystem.h"
#include "Cafe/TitleList/TitleList.h"
@ -20,7 +17,6 @@
#include "Common/ExceptionHandler/ExceptionHandler.h"
#include "Common/cpu_features.h"
#include <wx/setup.h>
#include "util/helpers/helpers.h"
#include "config/ActiveSettings.h"
#include "Cafe/HW/Latte/Renderer/Vulkan/VsyncDriver.h"
@ -124,7 +120,7 @@ void CemuCommonInit()
WindowsInitCwd();
ExceptionHandler_Init();
// read config
g_config.Load();
GetConfigHandle().Load();
if (NetworkConfig::XMLExists())
n_config.Load();
// parallelize expensive init code
@ -231,7 +227,7 @@ int wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LP
SDL_SetMainReady();
if (!LaunchSettings::HandleCommandline(lpCmdLine))
return 0;
gui_create();
WindowSystem::Create();
return 0;
}
@ -243,7 +239,7 @@ int main(int argc, char* argv[])
SDL_SetMainReady();
if (!LaunchSettings::HandleCommandline(argc, argv))
return 0;
gui_create();
WindowSystem::Create();
return 0;
}
@ -256,7 +252,7 @@ int main(int argc, char *argv[])
#endif
if (!LaunchSettings::HandleCommandline(argc, argv))
return 0;
gui_create();
WindowSystem::Create();
return 0;
}
#endif