|
40 | 40 | }, 'OS=="win"', {
|
41 | 41 | 'defines': ['<@(openssl_defines_x86_win)'],
|
42 | 42 | 'sources': ['<@(openssl_sources_x86_win32_masm)'],
|
43 |
| - 'rules': [ |
44 |
| - { |
45 |
| - 'rule_name': 'Assemble', |
46 |
| - 'extension': 'asm', |
47 |
| - 'inputs': [], |
48 |
| - 'outputs': [ |
49 |
| - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
50 |
| - ], |
51 |
| - 'action': [ |
52 |
| - 'ml.exe', |
53 |
| - '/Zi', |
54 |
| - '/safeseh', |
55 |
| - '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
56 |
| - '/c', '<(RULE_INPUT_PATH)', |
57 |
| - ], |
58 |
| - 'process_outputs_as_sources': 0, |
59 |
| - 'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.', |
60 |
| - } |
61 |
| - ], |
62 | 43 | }, { # Linux or others
|
63 | 44 | 'defines': ['<@(openssl_defines_x86_elf)'],
|
64 | 45 | 'sources': ['<@(openssl_sources_x86_elf_gas)'],
|
|
73 | 54 | }, 'OS=="win"', {
|
74 | 55 | 'defines': ['<@(openssl_defines_x64_win)'],
|
75 | 56 | 'sources': ['<@(openssl_sources_x64_win32_masm)'],
|
76 |
| - 'rules': [ |
77 |
| - { |
78 |
| - 'rule_name': 'Assemble', |
79 |
| - 'extension': 'asm', |
80 |
| - 'inputs': [], |
81 |
| - 'outputs': [ |
82 |
| - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
83 |
| - ], |
84 |
| - 'action': [ |
85 |
| - 'ml64.exe', |
86 |
| - '/Zi', |
87 |
| - '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
88 |
| - '/c', '<(RULE_INPUT_PATH)', |
89 |
| - ], |
90 |
| - 'process_outputs_as_sources': 0, |
91 |
| - 'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.', |
92 |
| - } |
93 |
| - ], |
94 | 57 | }, { # Linux or others
|
95 | 58 | 'defines': ['<@(openssl_defines_x64_elf)'],
|
96 | 59 | 'sources': ['<@(openssl_sources_x64_elf_gas)'],
|
|
105 | 68 | ],
|
106 | 69 | }], # end of conditions of openssl_no_asm
|
107 | 70 | ['OS=="win"', {
|
108 |
| - 'defines' : ['<@(openssl_defines_all_win)'] |
| 71 | + 'defines' : ['<@(openssl_defines_all_win)'], |
| 72 | + 'conditions': [ |
| 73 | + ['target_arch=="ia32"', { |
| 74 | + 'rules': [ |
| 75 | + { |
| 76 | + 'rule_name': 'Assemble', |
| 77 | + 'extension': 'asm', |
| 78 | + 'inputs': [], |
| 79 | + 'outputs': [ |
| 80 | + '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
| 81 | + ], |
| 82 | + 'action': [ |
| 83 | + 'ml.exe', |
| 84 | + '/Zi', |
| 85 | + '/safeseh', |
| 86 | + '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
| 87 | + '/c', '<(RULE_INPUT_PATH)', |
| 88 | + ], |
| 89 | + 'process_outputs_as_sources': 0, |
| 90 | + 'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.', |
| 91 | + } |
| 92 | + ], |
| 93 | + }, 'target_arch=="x64"', { |
| 94 | + 'rules': [ |
| 95 | + { |
| 96 | + 'rule_name': 'Assemble', |
| 97 | + 'extension': 'asm', |
| 98 | + 'inputs': [], |
| 99 | + 'outputs': [ |
| 100 | + '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
| 101 | + ], |
| 102 | + 'action': [ |
| 103 | + 'ml64.exe', |
| 104 | + '/Zi', |
| 105 | + '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', |
| 106 | + '/c', '<(RULE_INPUT_PATH)', |
| 107 | + ], |
| 108 | + 'process_outputs_as_sources': 0, |
| 109 | + 'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.', |
| 110 | + } |
| 111 | + ], |
| 112 | + }], |
| 113 | + ], |
109 | 114 | }, {
|
110 | 115 | 'defines' : ['<@(openssl_defines_all_non_win)']
|
111 | 116 | }]
|
|
0 commit comments