aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-09-01 07:51:56 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-09-01 07:51:56 -0700
commit730118d80f5f037846e522de54508832854e5dd3 (patch)
treeb7d2d247b7e2b5ad8a10930eaf06ae57a287f222 /templates
parent6fd238443e7250817049355f7ba164b0bf318394 (diff)
parent3b245fe388c31c85a18f68ccab8dd343bf08eae3 (diff)
Merge branch 'third-coming' into endpoints
Diffstat (limited to 'templates')
-rw-r--r--templates/vsprojects/vcxproj_defs.include4
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include
index 7057d11143..b371e95225 100644
--- a/templates/vsprojects/vcxproj_defs.include
+++ b/templates/vsprojects/vcxproj_defs.include
@@ -19,7 +19,9 @@
if target.build == 'protoc':
props.extend(['protoc', 'protobuf'])
else:
- props.extend(['winsock', 'protobuf', 'zlib', 'openssl'])
+ if target.language == 'c++':
+ props.extend(['protobuf'])
+ props.extend(['winsock', 'zlib', 'openssl'])
else:
props.extend(['winsock'])
props.extend(['global'])