diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-12-11 19:14:44 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-12-11 19:14:44 -0800 |
| commit | 1aa50eb2c493d9617787b1912425a12277bda006 (patch) | |
| tree | e0496f55ff08b73fbde1da2ab2f89c45f8c7014c /vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj | |
| parent | 8b12ec448f39fab7439024ab1a33271a2779b20e (diff) | |
| parent | df744bd389bffadd55de83395fcd3377e2b9469a (diff) | |
Merge pull request #4315 from jtattermusch/detect_platformtoolset
stop using _USE_32BIT_TIME_T and autodetect PlatformToolset on VS2015
Diffstat (limited to 'vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj')
| -rw-r--r-- | vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj b/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj index fa926d9fdc..9617541c50 100644 --- a/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj +++ b/vsprojects/vcxproj/test/h2_full_no_op_test/h2_full_no_op_test.vcxproj @@ -32,6 +32,9 @@ <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'" Label="Configuration"> <PlatformToolset>v120</PlatformToolset> </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'" Label="Configuration"> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> @@ -71,7 +74,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <TreatWarningAsError>true</TreatWarningAsError> @@ -107,7 +110,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <TreatWarningAsError>true</TreatWarningAsError> |