diff options
| author |  yang-g <yangg@google.com> | 2015-08-03 11:16:26 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-03 11:16:26 -0700 |
| commit | 43728840ca2752e7e1b4db5e58ecdccec9bc051e (patch) | |
| tree | 877f248fa15aaf6439d46e4a56cc2024a9cd843f /templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template | |
| parent | b36a582c966c6e6d5fb2054987fb76de15835c51 (diff) | |
| parent | bee7b68b54ae379b89424fd207dfa47ec68f87a7 (diff) | |
merge with head and resolve conflicts
Diffstat (limited to 'templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template')
| -rw-r--r-- | templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template b/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template index 8a5f1ca5b7..25b02b8c82 100644 --- a/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template +++ b/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc_csharp_ext', libs, configuration_type = 'DynamicLibrary', props = ['winsock'], packages=['openssl','zlib'])} +${gen_project('grpc_csharp_ext', libs, configuration_type = 'DynamicLibrary', props=['zlib-dll'], packages=['openssl','zlib'])} |