diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-22 17:13:31 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-06-22 17:13:31 +0300 |
| commit | f1cc6337999f56e56948eca20a9d18ffb4ab0b12 (patch) | |
| tree | 2ff83013ce7fb7687d633705dcf4ef35e13248a3 | |
| parent | d2b5e5c7a5cadc221bdc604cab12716238dbe4db (diff) | |
| download | meson-f1cc6337999f56e56948eca20a9d18ffb4ab0b12.zip meson-f1cc6337999f56e56948eca20a9d18ffb4ab0b12.tar.gz meson-f1cc6337999f56e56948eca20a9d18ffb4ab0b12.tar.bz2 | |
And the custom rules too.
| -rw-r--r-- | dependencies.py | 6 | ||||
| -rw-r--r-- | ninjabackend.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dependencies.py b/dependencies.py index 6b6f158..c9ed8bc 100644 --- a/dependencies.py +++ b/dependencies.py @@ -529,17 +529,17 @@ class Qt5Dependency(Dependency): return True def get_generate_rules(self): - moc_rule = CustomRule([self.moc.get_command(), '$mocflags', '@INFILE@', '-o', '@OUTFILE@'], + moc_rule = CustomRule([self.moc.get_command(), '$mocargs', '@INFILE@', '-o', '@OUTFILE@'], 'moc_@BASENAME@.cpp', 'moc_headers', 'moc_hdr_compile', 'Compiling header @INFILE@ with the moc preprocessor') - mocsrc_rule = CustomRule([self.moc.get_command(), '$mocflags', '@INFILE@', '-o', '@OUTFILE@'], + mocsrc_rule = CustomRule([self.moc.get_command(), '$mocargs', '@INFILE@', '-o', '@OUTFILE@'], '@BASENAME@.moc', 'moc_sources', 'moc_src_compile', 'Compiling source @INFILE@ with the moc preprocessor') ui_rule = CustomRule([self.uic.get_command(), '@INFILE@', '-o', '@OUTFILE@'], 'ui_@BASENAME@.h', 'ui_files', 'ui_compile', 'Compiling @INFILE@ with the ui compiler') rrc_rule = CustomRule([self.rcc.get_command(), '@INFILE@', '-o', '@OUTFILE@', - '${rcc_flags}'], '@BASENAME@.cpp','qresources', + '${rcc_args}'], '@BASENAME@.cpp','qresources', 'rc_compile', 'Compiling @INFILE@ with the rrc compiler') return [moc_rule, mocsrc_rule, ui_rule, rrc_rule] diff --git a/ninjabackend.py b/ninjabackend.py index f5a506f..67b26d7 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -966,9 +966,9 @@ class NinjaBackend(backends.Backend): infilename = os.path.join(self.build_to_src, target.get_source_subdir(), src) elem = NinjaBuildElement(outfilename, rule.name, infilename) if rule.name == 'rc_compile': - elem.add_item('rcc_flags', ['--name', basename]) + elem.add_item('rcc_args', ['--name', basename]) if rule.name == 'moc_hdr_compile' or rule.name == 'moc_src_compile': - elem.add_item('mocflags', ['-I', target.subdir]) + elem.add_item('mocargs', ['-I', target.subdir]) elem.write(outfile) if self.is_compilable_file(outfilename): if rule.name == 'moc_hdr_compile' or rule.name == 'moc_src_compile': |