| Index: third_party/yasm/yasm.gyp
|
| diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp
|
| index 533c1f0f983600a36b384253fa9afa9fc0c02773..01d12dd3cc085a4a179e21aad8169dc272cf71b2 100644
|
| --- a/third_party/yasm/yasm.gyp
|
| +++ b/third_party/yasm/yasm.gyp
|
| @@ -55,6 +55,14 @@
|
| # Various files referenced by multiple targets.
|
| 'version_file': 'version.mac', # Generated by genversion.
|
| 'genmodule_source': 'genmodule_outfile.c',
|
| +
|
| + 'conditions': [
|
| + ['OS=="win"', {
|
| + 'exe_ext': '.exe',
|
| + },{
|
| + 'exe_ext' : '',
|
| + }]
|
| + ],
|
| },
|
| 'targets': [
|
| {
|
| @@ -162,7 +170,7 @@
|
| {
|
| 'rule_name': 'generate_gperf',
|
| 'extension': 'gperf',
|
| - 'inputs': [ '<(PRODUCT_DIR)/genperf' ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genperf<(exe_ext)' ],
|
| 'outputs': [
|
| '<(generated_dir)/<(RULE_INPUT_ROOT).c',
|
| ],
|
| @@ -177,7 +185,7 @@
|
| {
|
| 'rule_name': 'generate_re2c',
|
| 'extension': 're',
|
| - 'inputs': [ '<(PRODUCT_DIR)/re2c' ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/re2c<(exe_ext)' ],
|
| 'outputs': [ '<(generated_dir)/<(RULE_INPUT_ROOT).c', ],
|
| 'action': [
|
| '<(PRODUCT_DIR)/re2c',
|
| @@ -201,7 +209,7 @@
|
| 'varname': 'nasm_standard_mac',
|
| 'outfile': '<(generated_dir)/nasm-macros.c',
|
| },
|
| - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
|
| 'outputs': [ '<(outfile)', ],
|
| 'action': ['<(PRODUCT_DIR)/genmacro',
|
| '<(outfile)', '<(varname)', '<(infile)', ],
|
| @@ -217,7 +225,7 @@
|
| 'varname': 'nasm_version_mac',
|
| 'outfile': '<(generated_dir)/nasm-version.c',
|
| },
|
| - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
|
| 'outputs': [ '<(outfile)', ],
|
| 'action': ['<(PRODUCT_DIR)/genmacro',
|
| '<(outfile)', '<(varname)', '<(infile)',
|
| @@ -234,7 +242,7 @@
|
| 'varname': 'win64_gas_stdmac',
|
| 'outfile': '<(generated_dir)/win64-gas.c',
|
| },
|
| - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
|
| 'outputs': [ '<(outfile)', ],
|
| 'action': ['<(PRODUCT_DIR)/genmacro',
|
| '<(outfile)', '<(varname)', '<(infile)',
|
| @@ -251,7 +259,7 @@
|
| 'varname': 'win64_nasm_stdmac',
|
| 'outfile': '<(generated_dir)/win64-nasm.c',
|
| },
|
| - 'inputs': [ '<(PRODUCT_DIR)/genmacro', '<(infile)', ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genmacro<(exe_ext)', '<(infile)', ],
|
| 'outputs': [ '<(outfile)', ],
|
| 'action': ['<(PRODUCT_DIR)/genmacro',
|
| '<(outfile)',
|
| @@ -274,7 +282,7 @@
|
| 'varname': 'license_msg',
|
| 'outfile': '<(generated_dir)/license.c',
|
| },
|
| - 'inputs': [ '<(PRODUCT_DIR)/genstring', '<(infile)', ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genstring<(exe_ext)', '<(infile)', ],
|
| 'outputs': [ '<(outfile)', ],
|
| 'action': ['<(PRODUCT_DIR)/genstring',
|
| '<(varname)',
|
| @@ -297,7 +305,7 @@
|
| # The license file is #included by yasm.c.
|
| 'outfile': '<(generated_dir)/lc3bid.c',
|
| },
|
| - 'inputs': [ '<(PRODUCT_DIR)/re2c', '<(infile)', ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/re2c<(exe_ext)', '<(infile)', ],
|
| 'outputs': [ '<(outfile)', ],
|
| 'action': [
|
| '<(PRODUCT_DIR)/re2c',
|
| @@ -320,7 +328,7 @@
|
| 'outfile': '<(generated_dir)/module.c',
|
| },
|
| 'inputs': [
|
| - '<(PRODUCT_DIR)/genmodule',
|
| + '<(PRODUCT_DIR)/genmodule<(exe_ext)',
|
| '<(module_in)',
|
| '<(makefile)'
|
| ],
|
| @@ -362,7 +370,7 @@
|
| {
|
| 'rule_name': 'generate_gperf',
|
| 'extension': 'gperf',
|
| - 'inputs': [ '<(PRODUCT_DIR)/genperf' ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genperf<(exe_ext)' ],
|
| 'outputs': [ '<(shared_generated_dir)/<(RULE_INPUT_ROOT).c', ],
|
| 'action': [
|
| '<(PRODUCT_DIR)/genperf',
|
| @@ -396,7 +404,7 @@
|
| },
|
| {
|
| 'action_name': 'generate_version',
|
| - 'inputs': [ '<(PRODUCT_DIR)/genversion' ],
|
| + 'inputs': [ '<(PRODUCT_DIR)/genversion<(exe_ext)' ],
|
| 'outputs': [ '<(shared_generated_dir)/<(version_file)', ],
|
| 'action': [
|
| '<(PRODUCT_DIR)/genversion',
|
|
|