aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects/vs2013
diff options
context:
space:
mode:
authorGravatar nnoble <nnoble@google.com>2014-12-12 15:43:38 -0800
committerGravatar Nicolas Noble <nnoble@google.com>2014-12-12 16:36:51 -0800
commit69ac39f4be7485d885aa69df1a621379f6fbf7ad (patch)
tree82737227519871071638b3904c2ca8a4d4f0ae20 /vsprojects/vs2013
parentbefd26501a6dbc0dca9d12444b4d245fa5560db0 (diff)
Makefile will now build zlib and/or OpenSSL if needed.
-) Detecting system and embedded presence of zlib and OpenSSL with ALPN. -) Automatically disabling secure targets if no OpenSSL present --> make all won't work if no OpenSSL is present, forcing the users to select the nonsecure Makefile targets explicitely. -) Removing build instructions for OpenSSL - this isn't really necessary anymore. -) Adding more blurb about OpenSSL and the new Makefile features. Change on 2014/12/12 by nnoble <nnoble@google.com> ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82020890
Diffstat (limited to 'vsprojects/vs2013')
-rw-r--r--vsprojects/vs2013/grpc_test_util.vcxproj2
1 files changed, 1 insertions, 1 deletions
diff --git a/vsprojects/vs2013/grpc_test_util.vcxproj b/vsprojects/vs2013/grpc_test_util.vcxproj
index 3077fd51c9..47fff8ad19 100644
--- a/vsprojects/vs2013/grpc_test_util.vcxproj
+++ b/vsprojects/vs2013/grpc_test_util.vcxproj
@@ -99,7 +99,7 @@
</ClCompile>
<ClCompile Include="..\..\test\core\transport\transport_end2end_tests.c">
</ClCompile>
- <ClCompile Include="..\..\test\core\statistics\log_tests.c">
+ <ClCompile Include="..\..\test\core\statistics\census_log_tests.c">
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />