diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/binding.gyp.template | 20 | ||||
| -rw-r--r-- | templates/gRPC.podspec.template | 8 |
2 files changed, 25 insertions, 3 deletions
diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index e86449fd3f..52070cf6e9 100644 --- a/templates/binding.gyp.template +++ b/templates/binding.gyp.template @@ -56,7 +56,9 @@ ], 'include_dirs': [ '.', - 'include' + 'include', + '<(node_root_dir)/deps/openssl/openssl/include', + '<(node_root_dir)/deps/zlib' ], 'conditions': [ ['OS != "win"', { @@ -75,6 +77,15 @@ ] ] }], + ["target_arch=='ia32'", { + "include_dirs": [ "<(node_root_dir)/deps/openssl/config/piii" ] + }], + ["target_arch=='x64'", { + "include_dirs": [ "<(node_root_dir)/deps/openssl/config/k8" ] + }], + ["target_arch=='arm'", { + "include_dirs": [ "<(node_root_dir)/deps/openssl/config/arm" ] + }] ] }, 'targets': [ @@ -94,6 +105,13 @@ '${source}', % endfor ], + "conditions": [ + ['OS == "mac"', { + 'xcode_settings': { + 'MACOSX_DEPLOYMENT_TARGET': '10.9' + } + }] + ], }, % endif % endfor diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 3b96fe2885..3885cb337b 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -88,8 +88,12 @@ ss.header_mappings_dir = '.' # This isn't officially supported in Cocoapods. We've asked for an alternative: # https://github.com/CocoaPods/CocoaPods/issues/4386 - ss.xcconfig = { 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/gRPC" ' + - '"$(PODS_ROOT)/Headers/Private/gRPC/include"' } + ss.xcconfig = { + 'USE_HEADERMAP' => 'NO', + 'ALWAYS_SEARCH_USER_PATHS' => 'NO', + 'USER_HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/gRPC"', + 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/gRPC/include"' + } ss.requires_arc = false ss.libraries = 'z' |