diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-12-03 15:28:12 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-12-03 15:28:12 +0300 |
| commit | c04ee0840dd977a2f70370c0be9ff457b3786fb4 (patch) | |
| tree | 170ab17a1ab7719653280c733190fc383bb6b610 /build/vc.common | |
| parent | 28bfc1633faded06c14308959796cc350878a896 (diff) | |
build props: toolset version changed to 15.0
Diffstat (limited to 'build/vc.common')
| -rw-r--r-- | build/vc.common/app.props | 2 | ||||
| -rw-r--r-- | build/vc.common/common.filters | 2 | ||||
| -rw-r--r-- | build/vc.common/common.props | 11 | ||||
| -rw-r--r-- | build/vc.common/core.props | 2 | ||||
| -rw-r--r-- | build/vc.common/icons.props | 6 | ||||
| -rw-r--r-- | build/vc.common/lib.props | 2 | ||||
| -rw-r--r-- | build/vc.common/plugin.props | 2 |
7 files changed, 8 insertions, 19 deletions
diff --git a/build/vc.common/app.props b/build/vc.common/app.props index 7a9ea31230..adc600eade 100644 --- a/build/vc.common/app.props +++ b/build/vc.common/app.props @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
<ItemGroup Label="ProjectConfigurations">
diff --git a/build/vc.common/common.filters b/build/vc.common/common.filters index ccbf069f07..db5ca7471c 100644 --- a/build/vc.common/common.filters +++ b/build/vc.common/common.filters @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
diff --git a/build/vc.common/common.props b/build/vc.common/common.props index f94ff23236..6ab75d32b8 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -1,16 +1,9 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="UserMacros">
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
- </PropertyGroup>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<RootNamespace>$(ProjectName)</RootNamespace>
<Keyword>Win32Proj</Keyword>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141_xp</PlatformToolset>
<IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
@@ -81,7 +74,7 @@ <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
<ClCompile>
- <EnableEnhancedInstructionSet Condition="'$(VisualStudioVersion)' != '10.0'">NoExtensions</EnableEnhancedInstructionSet>
+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(ProjectDir)..\..\libs\win32;$(ProjectDir)..\..\..\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/build/vc.common/core.props b/build/vc.common/core.props index 0a0836ea2a..67647e9b3b 100644 --- a/build/vc.common/core.props +++ b/build/vc.common/core.props @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
<ItemGroup Label="ProjectConfigurations">
diff --git a/build/vc.common/icons.props b/build/vc.common/icons.props index 39236afcf0..9ba4fd4c8c 100644 --- a/build/vc.common/icons.props +++ b/build/vc.common/icons.props @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
<ItemGroup Label="ProjectConfigurations">
@@ -26,10 +26,6 @@ <RootNamespace>$(ProjectName)</RootNamespace>
<Keyword>Win32Proj</Keyword>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110_xp</PlatformToolset>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0'">v120_xp</PlatformToolset>
- <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141_xp</PlatformToolset>
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Icons\</OutDir>
<IntDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
diff --git a/build/vc.common/lib.props b/build/vc.common/lib.props index c6e2f782f5..73e058989a 100644 --- a/build/vc.common/lib.props +++ b/build/vc.common/lib.props @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
<ItemGroup Label="ProjectConfigurations">
diff --git a/build/vc.common/plugin.props b/build/vc.common/plugin.props index ef1ed31add..1790b6d5a7 100644 --- a/build/vc.common/plugin.props +++ b/build/vc.common/plugin.props @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
</ImportGroup>
<ItemGroup Label="ProjectConfigurations">
|