Skip to content

Commit f782824

Browse files
author
Shigeki Ohtsu
committed
deps: refactor openssl.gyp
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]>
1 parent eb459c8 commit f782824

File tree

4 files changed

+1160
-1093
lines changed

4 files changed

+1160
-1093
lines changed

deps/openssl/masm_compile.gypi

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
'conditions': [
3+
['target_arch=="ia32"', {
4+
'rules': [
5+
{
6+
'rule_name': 'Assemble',
7+
'extension': 'asm',
8+
'inputs': [],
9+
'outputs': [
10+
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
11+
],
12+
'action': [
13+
'ml.exe',
14+
'/Zi',
15+
'/safeseh',
16+
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
17+
'/c', '<(RULE_INPUT_PATH)',
18+
],
19+
'process_outputs_as_sources': 0,
20+
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
21+
}
22+
],
23+
}, 'target_arch=="x64"', {
24+
'rules': [
25+
{
26+
'rule_name': 'Assemble',
27+
'extension': 'asm',
28+
'inputs': [],
29+
'outputs': [
30+
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
31+
],
32+
'action': [
33+
'ml64.exe',
34+
'/Zi',
35+
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
36+
'/c', '<(RULE_INPUT_PATH)',
37+
],
38+
'process_outputs_as_sources': 0,
39+
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
40+
}
41+
],
42+
}],
43+
],
44+
}

deps/openssl/openssl-cli.gypi

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
'target_name': 'openssl-cli',
3+
'type': 'executable',
4+
'dependencies': ['openssl'],
5+
'defines': [
6+
'MONOLITH'
7+
],
8+
'sources': ['<@(openssl_cli_sources)'],
9+
'conditions': [
10+
['OS=="solaris"', {
11+
'libraries': ['<@(openssl_cli_libraries_solaris)']
12+
}, 'OS=="win"', {
13+
'link_settings': {
14+
'libraries': ['<@(openssl_cli_libraries_win)'],
15+
},
16+
}, 'OS in "linux android"', {
17+
'link_settings': {
18+
'libraries': [
19+
'-ldl',
20+
],
21+
},
22+
}],
23+
],
24+
}

0 commit comments

Comments
 (0)