diff options
| author |  yang-g <yangg@google.com> | 2016-01-15 14:08:58 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-15 14:08:58 -0800 |
| commit | 5d7b6a21dfe6edc2328022c5804ebd5ffdc4fe9f (patch) | |
| tree | 14510a2bc1dc2fe506170e940e7969bf2208675e /vsprojects/vcxproj/test/fling_server | |
| parent | df2778d45f57f0647448e566b5bb7e3643b51ebb (diff) | |
| parent | 623ca7dd9408fea1b6e88be0ca1e0f845a0533e8 (diff) | |
Merge remote-tracking branch 'upstream/master' into epollset
Diffstat (limited to 'vsprojects/vcxproj/test/fling_server')
| -rw-r--r-- | vsprojects/vcxproj/test/fling_server/fling_server.vcxproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj b/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj index 5ce96bd2d5..99dd3f1ec3 100644 --- a/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj +++ b/vsprojects/vcxproj/test/fling_server/fling_server.vcxproj @@ -63,12 +63,14 @@ <TargetName>fling_server</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> <Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)'=='Release'"> <TargetName>fling_server</TargetName> <Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib> <Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib> + <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl> <Configuration-grpc_dependencies_openssl>Release</Configuration-grpc_dependencies_openssl> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |