diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-03 19:08:05 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-06 20:16:48 +0400 |
| commit | d35b19276e51cb90967846fc97fe5dfa045c4aa2 (patch) | |
| tree | b55a72f863eae4843ffba546837e5772ad67bb23 | |
| parent | 7e57cadeec9ed26df1362ee7f32cff543bfd2531 (diff) | |
Make /analyze work for our VS2012 projects.
| -rw-r--r-- | src/common.props | 1 | ||||
| -rw-r--r-- | src/platform.props | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/common.props b/src/common.props index d1ae499c6..c6ba69d2d 100644 --- a/src/common.props +++ b/src/common.props @@ -21,6 +21,7 @@ <ClCompile>
<AdditionalOptions>/w34706 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(ANALYZE)'=='true'">/wd4244 /wd4996 /wd6031 /wd6309 /wd6387 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(ANALYZE)'=='true' And '$(PlatformToolsetVersion)'=='110'">/wd4005 %(AdditionalOptions)</AdditionalOptions>
<EnablePREfast Condition="'$(Platform)'=='Win32' And '$(ANALYZE)'=='true'">true</EnablePREfast>
<BufferSecurityCheck>true</BufferSecurityCheck>
<ExceptionHandling>Sync</ExceptionHandling>
diff --git a/src/platform.props b/src/platform.props index 09927fdce..7da55ead5 100644 --- a/src/platform.props +++ b/src/platform.props @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)'=='11.0'"> - <PlatformToolset>v110_xp</PlatformToolset> + <PropertyGroup Label="Configuration"> + <PlatformToolset Condition="'$(VisualStudioVersion)'=='11.0' And '$(ANALYZE)'!='true'">v110_xp</PlatformToolset> + <PlatformToolset Condition="'$(VisualStudioVersion)'=='11.0' And '$(ANALYZE)'=='true'">v110</PlatformToolset> </PropertyGroup> </Project> |