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 #11436 from shuffle2/msvc-Zc 

msvc: update c++ conformance flags
This commit is contained in:
Mai 2023-01-24 16:46:14 +00:00 committed by GitHub
parent 014d0573b8 f2aed92fd1
commit 5525f011be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -318,23 +318,13 @@ if(MSVC)
add_compile_options(/Oi) add_compile_options(/Oi)
# Enable buffer security check on Debug, disable otherwise # Enable buffer security check on Debug, disable otherwise
add_compile_options($<IF:$<CONFIG:Debug>,/GS,/GS->) add_compile_options($<IF:$<CONFIG:Debug>,/GS,/GS->)
# Enforce C++ standard conforming conversion rules to catch possible bugs
add_compile_options(/permissive-)
# Remove unreferenced inline functions/data to reduce link time and catch bugs # Remove unreferenced inline functions/data to reduce link time and catch bugs
# Note: In msbuild build, this gets set by msbuild by default
add_compile_options(/Zc:inline) add_compile_options(/Zc:inline)
# Assume `new` (w/o std::nothrow) throws to reduce binary size # Fix various other non-conformant behaviors
add_compile_options(/Zc:throwingNew) add_compile_options(/Zc:__cplusplus,enumTypes,externConstexpr,preprocessor,throwingNew)
# Enforce strict volatile semantics as per ISO C++ # Enforce strict volatile semantics as per ISO C++
add_compile_options(/volatile:iso) add_compile_options(/volatile:iso)
# Fix non-conformant lambda behavior (constexpr variables shouldn't need capturing)
add_compile_options(/experimental:newLambdaProcessor)
# Fix various other non-conformant behaviors
add_compile_options(/Zc:__cplusplus,externConstexpr,lambda,preprocessor)
# Temporarily disable warnings to enable /Zc:preprocessor compatibility with WinSDK headers.
add_compile_options(
/wd5105 # macro expansion producing 'defined' has undefined behavior
)
# Use 'precise' floating point model # Use 'precise' floating point model
add_compile_options(/fp:precise) add_compile_options(/fp:precise)

4
Source/VSProps/Base.props
View File

@ -33,7 +33,8 @@
<!--Enable Standard Conformance--> <!--Enable Standard Conformance-->
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<!--Enforce some behaviors as standards-conformant when they don't default as such.--> <!--Enforce some behaviors as standards-conformant when they don't default as such.-->
<AdditionalOptions>/Zc:__cplusplus,externConstexpr,lambda,preprocessor,throwingNew /volatile:iso %(AdditionalOptions)</AdditionalOptions> <!--TODO on VS 17.5: templateScope-->
<AdditionalOptions>/Zc:__cplusplus,enumTypes,externConstexpr,preprocessor,throwingNew /volatile:iso %(AdditionalOptions)</AdditionalOptions>
<!--Enable detailed debug info--> <!--Enable detailed debug info-->
<AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zo %(AdditionalOptions)</AdditionalOptions>
<!--Treat sources as utf-8--> <!--Treat sources as utf-8-->
@ -73,6 +74,7 @@
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<!--TODO on VS 17.5: /Zc:checkGwOdr-->
<AdditionalOptions>/Gw %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Gw %(AdditionalOptions)</AdditionalOptions>
<WholeProgramOptimization Condition="'$(DolphinRelease)'=='true'">true</WholeProgramOptimization> <WholeProgramOptimization Condition="'$(DolphinRelease)'=='true'">true</WholeProgramOptimization>
</ClCompile> </ClCompile>