diff --git a/binding.gyp b/binding.gyp index 050bc406645e2b79263aa8e13c564b2516bb7aaf..c2f9c6526d2b138fd57673a664f817d982da79b7 100644 --- a/binding.gyp +++ b/binding.gyp @@ -54,7 +54,8 @@ ], 'include_dirs': [ '.', - 'include' + 'include', + '<(node_root_dir)/deps/openssl/openssl/include' ], 'conditions': [ ['OS != "win"', { @@ -73,6 +74,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': [ @@ -124,6 +134,13 @@ 'src/core/support/time_win32.c', 'src/core/support/tls_pthread.c', ], + "conditions": [ + ['OS == "mac"', { + 'xcode_settings': { + 'MACOSX_DEPLOYMENT_TARGET': '10.9' + } + }] + ], }, { 'target_name': 'grpc', @@ -282,6 +299,13 @@ 'src/core/census/operation.c', 'src/core/census/tracing.c', ], + "conditions": [ + ['OS == "mac"', { + 'xcode_settings': { + 'MACOSX_DEPLOYMENT_TARGET': '10.9' + } + }] + ], }, { 'include_dirs': [ diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index e86449fd3f9228ff44c1d7f0a6a58d62887ee974..60a64273bfe3830cc02fea061082469fb42299c2 100644 --- a/templates/binding.gyp.template +++ b/templates/binding.gyp.template @@ -56,7 +56,8 @@ ], 'include_dirs': [ '.', - 'include' + 'include', + '<(node_root_dir)/deps/openssl/openssl/include' ], 'conditions': [ ['OS != "win"', { @@ -75,6 +76,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 +104,13 @@ '${source}', % endfor ], + "conditions": [ + ['OS == "mac"', { + 'xcode_settings': { + 'MACOSX_DEPLOYMENT_TARGET': '10.9' + } + }] + ], }, % endif % endfor