Merge pull request #10913 from shuffle2/vsnext
msvc: fix issues with vs 17.3
This commit is contained in:
commit
385764ebe0
|
@ -396,6 +396,9 @@ if (MSVC)
|
|||
target_compile_options(dolphin-emu PRIVATE "${qtGuiPriv}")
|
||||
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)
|
||||
# Qt6 requires RTTI
|
||||
remove_cxx_flag_from_target(dolphin-emu "/GR-")
|
||||
|
|
|
@ -31,6 +31,9 @@
|
|||
<AdditionalIncludeDirectories>$(ProjectDir)TAS;%(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-->
|
||||
<AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
|
|
|
@ -11,11 +11,12 @@
|
|||
#include <optional>
|
||||
#include <string>
|
||||
|
||||
#include "Core/Boot/Boot.h"
|
||||
|
||||
class QStackedWidget;
|
||||
class QString;
|
||||
|
||||
class BreakpointWidget;
|
||||
class BootSessionData;
|
||||
struct BootParameters;
|
||||
class CheatsManager;
|
||||
class CodeWidget;
|
||||
|
|
Loading…
Reference in New Issue