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/test_tcp_server/test_tcp_server.vcxproj | |
| parent | 2e14b1f588a5a198a4b20d2801e199de49ac5f9c (diff) | |
| parent | 67f23d783265fa6c6cc85da3fb61d42f01cadbaa (diff) | |
Merge branch 'yawn' into proto_names
Diffstat (limited to 'vsprojects/vcxproj/test_tcp_server/test_tcp_server.vcxproj')
| -rw-r--r-- | vsprojects/vcxproj/test_tcp_server/test_tcp_server.vcxproj | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/vsprojects/vcxproj/test_tcp_server/test_tcp_server.vcxproj b/vsprojects/vcxproj/test_tcp_server/test_tcp_server.vcxproj index ea92d698aa..d0bf6c085b 100644 --- a/vsprojects/vcxproj/test_tcp_server/test_tcp_server.vcxproj +++ b/vsprojects/vcxproj/test_tcp_server/test_tcp_server.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>test_tcp_server</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,24 +145,25 @@ <OptimizeReferences>true</OptimizeReferences> </Link> </ItemDefinitionGroup> + <ItemGroup> - <ClInclude Include="..\..\..\test\core\util\test_tcp_server.h" /> + <ClInclude Include="$(SolutionDir)\..\test\core\util\test_tcp_server.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\test\core\util\test_tcp_server.c"> + <ClCompile Include="$(SolutionDir)\..\test\core\util\test_tcp_server.c"> </ClCompile> </ItemGroup> <ItemGroup> - <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>{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> </ItemGroup> |