Skip to content

Commit

Permalink
deps: refactor openssl.gyp
Browse files Browse the repository at this point in the history
Updated gyp has "else if" syntax in condition. Use this for
target_arch and OS switches. Several sources, defines, rules and
libraries variables moved to gypi files.

PR-URL: #1325
Reviewed-By: Fedor Indutny <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
  • Loading branch information
Shigeki Ohtsu committed Apr 4, 2015
1 parent eb459c8 commit f782824
Show file tree
Hide file tree
Showing 4 changed files with 1,160 additions and 1,093 deletions.
44 changes: 44 additions & 0 deletions deps/openssl/masm_compile.gypi
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
'conditions': [
['target_arch=="ia32"', {
'rules': [
{
'rule_name': 'Assemble',
'extension': 'asm',
'inputs': [],
'outputs': [
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
],
'action': [
'ml.exe',
'/Zi',
'/safeseh',
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
'/c', '<(RULE_INPUT_PATH)',
],
'process_outputs_as_sources': 0,
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
}
],
}, 'target_arch=="x64"', {
'rules': [
{
'rule_name': 'Assemble',
'extension': 'asm',
'inputs': [],
'outputs': [
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
],
'action': [
'ml64.exe',
'/Zi',
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
'/c', '<(RULE_INPUT_PATH)',
],
'process_outputs_as_sources': 0,
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
}
],
}],
],
}
24 changes: 24 additions & 0 deletions deps/openssl/openssl-cli.gypi
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
'target_name': 'openssl-cli',
'type': 'executable',
'dependencies': ['openssl'],
'defines': [
'MONOLITH'
],
'sources': ['<@(openssl_cli_sources)'],
'conditions': [
['OS=="solaris"', {
'libraries': ['<@(openssl_cli_libraries_solaris)']
}, 'OS=="win"', {
'link_settings': {
'libraries': ['<@(openssl_cli_libraries_win)'],
},
}, 'OS in "linux android"', {
'link_settings': {
'libraries': [
'-ldl',
],
},
}],
],
}
Loading

0 comments on commit f782824

Please sign in to comment.