diff options
author | Craig Tiller <ctiller@google.com> | 2015-12-22 14:23:51 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-12-22 14:23:51 -0800 |
commit | 00f8702c5ed38bb199050bb5e000204d9cd30f98 (patch) | |
tree | 902f39826b3d1febc25ebb7658f761351df21f39 /vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj | |
parent | 2e14b1f588a5a198a4b20d2801e199de49ac5f9c (diff) | |
parent | 67f23d783265fa6c6cc85da3fb61d42f01cadbaa (diff) |
Merge branch 'yawn' into proto_names
Diffstat (limited to 'vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj')
-rw-r--r-- | vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj | 70 |
1 files changed, 37 insertions, 33 deletions
diff --git a/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj b/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj index bc05153bb3..b85c713194 100644 --- a/vsprojects/vcxproj/interop_client_main/interop_client_main.vcxproj +++ b/vsprojects/vcxproj/interop_client_main/interop_client_main.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>interop_client_main</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,62 +145,63 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> + <ItemGroup> - <ClInclude Include="..\..\..\test\cpp\interop\interop_client.h" /> + <ClInclude Include="$(SolutionDir)\..\test\cpp\interop\interop_client.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\src\proto\grpc\testing\empty.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\empty.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\empty.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\empty.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\empty.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\empty.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\empty.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\empty.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\messages.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\messages.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\test.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\test.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\test.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\test.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\src\proto\grpc\testing\test.grpc.pb.cc"> + <ClCompile Include="$(SolutionDir)\..\src\proto\grpc\testing\test.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\src\proto\grpc\testing\test.grpc.pb.h"> + <ClInclude Include="$(SolutionDir)\..\src\proto\grpc\testing\test.grpc.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\test\cpp\interop\client.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\client.cc"> </ClCompile> - <ClCompile Include="..\..\..\test\cpp\interop\interop_client.cc"> + <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\interop_client.cc"> </ClCompile> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\interop_client_helper\interop_client_helper.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\interop_client_helper\interop_client_helper.vcxproj"> <Project>{AE8AE98D-8EB9-D931-AA79-F6AB16234A49}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc++_test_util\grpc++_test_util.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++_test_util\grpc++_test_util.vcxproj"> <Project>{0BE77741-552A-929B-A497-4EF7ECE17A64}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj"> <Project>{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj"> <Project>{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj"> <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj"> <Project>{EAB0A629-17A9-44DB-B5FF-E91A721FE037}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj"> <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project> </ProjectReference> - <ProjectReference Include="..\..\..\vsprojects\vcxproj\.\grpc++_test_config\grpc++_test_config.vcxproj"> + <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++_test_config\grpc++_test_config.vcxproj"> <Project>{3F7D093D-11F9-C4BC-BEB7-18EB28E3F290}</Project> </ProjectReference> </ItemGroup> |