ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10913 from shuffle2/vsnext 

msvc: fix issues with vs 17.3
This commit is contained in:
Mai 2022-08-03 14:21:53 -04:00 committed by GitHub
parent f3c85cad6e ec9b30681b
commit 385764ebe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -396,6 +396,9 @@ if (MSVC)
target_compile_options(dolphin-emu PRIVATE "${qtGuiPriv}") target_compile_options(dolphin-emu PRIVATE "${qtGuiPriv}")
target_compile_options(dolphin-emu PRIVATE "${qtWidgets}") target_compile_options(dolphin-emu PRIVATE "${qtWidgets}")
# Qt 6.3.0 headers use std::aligned_storage instead of alignas
target_compile_definitions(dolphin-emu PRIVATE _SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING)
if ("${QT_VERSION_MAJOR}" GREATER_EQUAL 6) if ("${QT_VERSION_MAJOR}" GREATER_EQUAL 6)
# Qt6 requires RTTI # Qt6 requires RTTI
remove_cxx_flag_from_target(dolphin-emu "/GR-") remove_cxx_flag_from_target(dolphin-emu "/GR-")

3
Source/Core/DolphinQt/DolphinQt.vcxproj
View File

@ -31,6 +31,9 @@
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
<PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!--Jump through some hoops to generate a pch file local to this project--> <!--Jump through some hoops to generate a pch file local to this project-->
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>

3
Source/Core/DolphinQt/MainWindow.h
View File

@ -11,11 +11,12 @@
#include <optional> #include <optional>
#include <string> #include <string>
#include "Core/Boot/Boot.h"
class QStackedWidget; class QStackedWidget;
class QString; class QString;
class BreakpointWidget; class BreakpointWidget;
class BootSessionData;
struct BootParameters; struct BootParameters;
class CheatsManager; class CheatsManager;
class CodeWidget; class CodeWidget;