From f7688acc21a70a61fbff0d6cd85bce02d60ea2ca Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 1 Nov 2025 15:35:51 -0400 Subject: [PATCH] fix? Signed-off-by: crueter --- src/yuzu/main_window.cpp | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cpp index d2a0bbfbb8..0cf40198c7 100644 --- a/src/yuzu/main_window.cpp +++ b/src/yuzu/main_window.cpp @@ -41,6 +41,7 @@ #include "multiplayer/state.h" // Qt Stuff // +#define QT_NO_OPENGL #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) #include #endif @@ -72,6 +73,17 @@ #include "qt_common/util/content.h" #include "qt_common/util/fs.h" +// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows +// defines. +static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper(const std::string& path, FileSys::OpenMode mode) { + return QtCommon::vfs->CreateDirectory(path, mode); +} + +static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::VirtualDir& dir, + const std::string& path) { + return dir->CreateFile(path); +} + // Frontend // #include "frontend_common/play_time_manager.h" @@ -126,6 +138,8 @@ #include // Platform stuff // +#include + #ifdef __APPLE__ #include // for chdir #endif @@ -143,6 +157,11 @@ #include "common/linux/gamemode.h" #endif +#ifdef _WIN32 +#include "core/core_timing.h" +#include "common/windows/timer_resolution.h" +#endif + #ifdef _WIN32 #include #include @@ -236,12 +255,10 @@ static void RemoveTitlebarFilter() { using namespace Common::Literals; +#include "qt_common/discord/discord.h" + #ifdef USE_DISCORD_PRESENCE #include "qt_common/discord/discord_impl.h" - -#include - -#include #endif #ifdef QT_STATICPLUGIN @@ -287,17 +304,6 @@ static void RemoveCachedContents() { Common::FS::RemoveDirRecursively(offline_system_data); } -// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows -// defines. -static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper(const std::string& path, FileSys::OpenMode mode) { - return QtCommon::vfs->CreateDirectory(path, mode); -} - -static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::VirtualDir& dir, - const std::string& path) { - return dir->CreateFile(path); -} - static void LogRuntimes() { #ifdef _MSC_VER // It is possible that the name of the dll will change.