BoringSSL: vsproject changes

2 files changed, 54 insertions, 50 deletions

diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
index 7773817628..6a70001e0e 100644
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.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_plugin_support</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,33 +145,34 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+
   <ItemGroup>
-    <ClInclude Include="..\..\..\include\grpc++\support\config.h" />
-    <ClInclude Include="..\..\..\include\grpc++\support\config_protobuf.h" />
-    <ClInclude Include="..\..\..\src\compiler\config.h" />
-    <ClInclude Include="..\..\..\src\compiler\cpp_generator.h" />
-    <ClInclude Include="..\..\..\src\compiler\cpp_generator_helpers.h" />
-    <ClInclude Include="..\..\..\src\compiler\csharp_generator.h" />
-    <ClInclude Include="..\..\..\src\compiler\csharp_generator_helpers.h" />
-    <ClInclude Include="..\..\..\src\compiler\generator_helpers.h" />
-    <ClInclude Include="..\..\..\src\compiler\objective_c_generator.h" />
-    <ClInclude Include="..\..\..\src\compiler\objective_c_generator_helpers.h" />
-    <ClInclude Include="..\..\..\src\compiler\python_generator.h" />
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator.h" />
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator_helpers-inl.h" />
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator_map-inl.h" />
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator_string-inl.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config.h" />
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config_protobuf.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\config.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator_helpers.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator_helpers.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\generator_helpers.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator_helpers.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\python_generator.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_helpers-inl.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_map-inl.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_string-inl.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\compiler\cpp_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\cpp_generator.cc">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\csharp_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\csharp_generator.cc">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\objective_c_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\objective_c_generator.cc">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\python_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\python_generator.cc">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\ruby_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\ruby_generator.cc">
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
index 3d1bd7b27c..133e1e33d9 100644
--- a/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_plugin_support/grpc_plugin_support.vcxproj.filters
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\compiler\cpp_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\cpp_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\csharp_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\csharp_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\objective_c_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\objective_c_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\python_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\python_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\compiler\ruby_generator.cc">
+    <ClCompile Include="$(SolutionDir)\..\src\compiler\ruby_generator.cc">
       <Filter>src\compiler</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\include\grpc++\support\config.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\grpc++\support\config_protobuf.h">
+    <ClInclude Include="$(SolutionDir)\..\include\grpc++\support\config_protobuf.h">
       <Filter>include\grpc++\support</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\config.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\config.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\cpp_generator.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\cpp_generator_helpers.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\cpp_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\csharp_generator.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\csharp_generator_helpers.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\csharp_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\generator_helpers.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\objective_c_generator.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\objective_c_generator_helpers.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\objective_c_generator_helpers.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\python_generator.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\python_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator_helpers-inl.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_helpers-inl.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator_map-inl.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_map-inl.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\compiler\ruby_generator_string-inl.h">
+    <ClInclude Include="$(SolutionDir)\..\src\compiler\ruby_generator_string-inl.h">
       <Filter>src\compiler</Filter>
     </ClInclude>
   </ItemGroup>