Skip to content

Commit

Permalink
enable MSVC Standards Conformance (/permissive-)
Browse files Browse the repository at this point in the history
...for all projects except wxWidgets. it includes WinSDK files that do not
support /permissive- yet; and the only way around this is to disable the
flag on project level.
  • Loading branch information
BhaaLseN committed May 26, 2017
1 parent 700a443 commit 4cefcee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Externals/wxWidgets3/build/msw/wx_base.vcxproj
Expand Up @@ -1365,7 +1365,13 @@
<Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
<Import Project="..\..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Label="UserMacros">
<!--
wxWidgets includes Windows SDK header files that do not support /permissive- yet, which would fail the build.
Disable the flag until this is sorted out (it probably doesn't matter too much for Externals anyways.)
-->
<SupportsStandardConformance>false</SupportsStandardConformance>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile>
<PreprocessorDefinitions>__WXDEBUG__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down
2 changes: 2 additions & 0 deletions Source/VSProps/Base.props
Expand Up @@ -80,6 +80,8 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<MinimalRebuild>false</MinimalRebuild>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<!--Enable Standard Conformance (unless the project does not support it)-->
<AdditionalOptions Condition="'$(SupportsStandardConformance)' != 'false'">/permissive- %(AdditionalOptions)</AdditionalOptions>
<!--Enforce some behaviors as standards-conformant when they don't default as such-->
<AdditionalOptions>/Zc:inline /Zc:rvalueCast /volatile:iso %(AdditionalOptions)</AdditionalOptions>
<!--Enable detailed debug info-->
Expand Down

0 comments on commit 4cefcee

Please sign in to comment.