diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-12-16 17:36:04 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-12-16 17:36:04 -0800 |
| commit | 7052ac25e60e137514d9a201a86eeb9b29b03d24 (patch) | |
| tree | 2ce8f32319129e346a27d3b29a9b8d6b440cdd6c /vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj | |
| parent | 886b7d19bafbb61e84141e66a040da8c27781c44 (diff) | |
| parent | 788767a18f918131268ca88985b3547a8257e973 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj')
| -rw-r--r-- | vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj b/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj index 848fbaad1f..90f8c9c20d 100644 --- a/vsprojects/vcxproj/test/end2end_test/end2end_test.vcxproj +++ b/vsprojects/vcxproj/test/end2end_test/end2end_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> @@ -73,7 +76,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> @@ -109,7 +112,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> |