summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2015-06-14 12:36:37 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2015-06-14 12:36:37 +0000
commit8e972b8c7f975654aecc6616b36d54140008a03c (patch)
treeae60b6152761d99b3ba7181e165acf2fc2461bbb
parent97785a240eb32d83ffedaa463afaacf2304b3634 (diff)
patch for MSVC 2010 recognizing its own version in unified projects
git-svn-id: http://svn.miranda-ng.org/main/trunk@14159 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--build/vc.common/common.props6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/vc.common/common.props b/build/vc.common/common.props
index 4348ad800b..9ede2d526e 100644
--- a/build/vc.common/common.props
+++ b/build/vc.common/common.props
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <CommonLibDir Condition="'$(VisualStudioVersion)' == '10.0'">$(ProjectDir)..\..\bin10\lib</CommonLibDir>
+ <CommonLibDir Condition="'$(VisualStudioVersion)' == ''">$(ProjectDir)..\..\bin10\lib</CommonLibDir>
<CommonLibDir Condition="'$(VisualStudioVersion)' == '12.0'">$(ProjectDir)..\..\bin12\lib</CommonLibDir>
</PropertyGroup>
<PropertyGroup>
<RootNamespace>$(ProjectName)</RootNamespace>
<Keyword>Win32Proj</Keyword>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
+ <PlatformToolset Condition="'$(VisualStudioVersion)' == ''">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140</PlatformToolset>
@@ -75,7 +75,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
- <AdditionalOptions Condition="'$(VisualStudioVersion)' == '10.0'">/PDBALTPATH:%_PDB%</AdditionalOptions>
+ <AdditionalOptions Condition="'$(VisualStudioVersion)' == ''">/PDBALTPATH:%_PDB%</AdditionalOptions>
</Link>
</ItemDefinitionGroup>