Removed C++ build from gyp file, fixed some minor issues

pull/3400/head
murgatroid99 10 years ago
parent 2d6d3300d9
commit ca9db40656
  1. 1729
      grpc.gyp
  2. 18
      templates/grpc.gyp.template

1729
grpc.gyp

File diff suppressed because it is too large Load Diff

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- | --- |
# GRPC gyp file # GRPC gyp file
# This currently builds C and C++ code. # This currently builds C code.
# This file has been automatically generated from a template file. # This file has been automatically generated from a template file.
# Please look at the templates directory instead. # Please look at the templates directory instead.
# This file can be regenerated from the template by running # This file can be regenerated from the template by running
@ -64,7 +64,12 @@
'GenerateDebugInformation': 'true', 'GenerateDebugInformation': 'true',
}, },
}, },
'defines': [
# TODO: Properly check for ALPN support
'TSI_OPENSSL_ALPN_SUPPORT=0'
],
'include_dirs': [ 'include_dirs': [
'.',
'include' 'include'
], ],
'libraries': [ 'libraries': [
@ -72,12 +77,12 @@
'-lssl', '-lssl',
'-ldl', '-ldl',
'-lpthread', '-lpthread',
'-lz', '-lz'
'-lprotobuf'
] ]
}, },
'targets': [ 'targets': [
% for lib in libs: % for lib in libs:
% if lib.language == 'c':
{ {
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
@ -89,12 +94,14 @@
], ],
'sources': [ 'sources': [
% for source in lib.src: % for source in lib.src:
'${source}' '${source}',
% endfor % endfor
] ],
}, },
% endif
% endfor % endfor
% for tgt in targets: % for tgt in targets:
% if tgt.language == 'c':
{ {
'target_name': '${tgt.name}', 'target_name': '${tgt.name}',
'type': 'executable', 'type': 'executable',
@ -109,6 +116,7 @@
% endfor % endfor
] ]
}, },
% endif
% endfor % endfor
] ]
} }

Loading…
Cancel
Save