diff options
| author | flysha <flysha@live.com> | 2017-01-25 10:01:57 +0800 |
|---|---|---|
| committer | flysha <flysha@live.com> | 2017-01-25 10:01:57 +0800 |
| commit | 033c7d0af6a5f5129e73ebb63b1abea0db128da6 (patch) | |
| tree | f0998507be51a02b1b9fa1e4e3836b95fe826ab8 /toolsrc/vcpkgcommon | |
| parent | ce9741f71b079dad944e177daf984160bb9ce1bb (diff) | |
| parent | a4bcf67010a438a554696988e17f1066be629dba (diff) | |
| download | vcpkg-033c7d0af6a5f5129e73ebb63b1abea0db128da6.tar.gz vcpkg-033c7d0af6a5f5129e73ebb63b1abea0db128da6.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'toolsrc/vcpkgcommon')
| -rw-r--r-- | toolsrc/vcpkgcommon/vcpkgcommon.vcxproj | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj b/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj index c0d108602..2504a0227 100644 --- a/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj +++ b/toolsrc/vcpkgcommon/vcpkgcommon.vcxproj @@ -22,31 +22,28 @@ <ProjectGuid>{7129F242-F20C-43E7-BBEC-4E15B71890B2}</ProjectGuid> <RootNamespace>vcpkgcommon</RootNamespace> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <PlatformToolset Condition="'$(PlatformToolset)' == ''">v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> |