-
Notifications
You must be signed in to change notification settings - Fork 30k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
4 changed files
with
1,160 additions
and
1,093 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.', | ||
} | ||
], | ||
}], | ||
], | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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', | ||
], | ||
}, | ||
}], | ||
], | ||
} |
Oops, something went wrong.