diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-12-22 12:51:27 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-12-22 12:51:27 -0800 |
| commit | 77fc4d35e41cc9041021f70dd62200ec3985704a (patch) | |
| tree | 38ffcd00606c4c106cc57b7f9fbfc849d297bc07 /vsprojects/vcxproj/grpc++_test_config | |
| parent | 0fe5ee7be3ffc6386a6e0aefc40342cf64f44062 (diff) | |
BoringSSL: vsproject changes
Diffstat (limited to 'vsprojects/vcxproj/grpc++_test_config')
| -rw-r--r-- | vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj | 28 | ||||
| -rw-r--r-- | vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj.filters | 4 |
2 files changed, 18 insertions, 14 deletions
diff --git a/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj b/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj index d3cabe2f1a..5eab788e4c 100644 --- a/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj +++ b/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj @@ -52,8 +52,8 @@ </ImportGroup> <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\..\vsprojects\global.props" /> - <Import Project="..\..\..\vsprojects\winsock.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\global.props" /> + <Import Project="$(SolutionDir)\..\vsprojects\winsock.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)'=='Debug'"> @@ -62,7 +62,7 @@ <PropertyGroup Condition="'$(Configuration)'=='Release'"> <TargetName>grpc++_test_config</TargetName> </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> @@ -80,7 +80,8 @@ <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> @@ -98,14 +99,15 @@ <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <TreatWarningAsError>true</TreatWarningAsError> @@ -120,14 +122,15 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <TreatWarningAsError>true</TreatWarningAsError> @@ -142,11 +145,12 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> + <ItemGroup> - <ClInclude Include="..\..\..\test\cpp\util\test_config.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\test_config.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\test\cpp\util\test_config.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\test_config.cc"> </ClCompile> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj.filters b/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj.filters index f1aae8d55e..b4d4134b05 100644 --- a/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj.filters +++ b/vsprojects/vcxproj/grpc++_test_config/grpc++_test_config.vcxproj.filters @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\test\cpp\util\test_config.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\test_config.cc"> <Filter>test\cpp\util</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\test\cpp\util\test_config.h"> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\test_config.h"> <Filter>test\cpp\util</Filter> </ClInclude> </ItemGroup> |