diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-09-20 22:14:38 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-09-20 22:14:38 +0300 |
| commit | 154dc839739909bf889b3f438f43a9ff0e3eb608 (patch) | |
| tree | a1a0f96b01f31e06211accd9bfe423558fd0b83a /ninjabackend.py | |
| parent | 5d17e417b473a19b67176927fd0684d764bc0786 (diff) | |
| download | meson-154dc839739909bf889b3f438f43a9ff0e3eb608.tar.gz | |
Multiple generated sources in one target now work.
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 616041ecc..d9a9b5b63 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -211,22 +211,22 @@ class NinjaBackend(backends.Backend): # people generate files with weird suffixes (.inc, .fh) that they then include # in their source files. header_deps.append(RawFilename(src)) - break # just to cut down on indentation size - for src in gensource.get_outfilelist(): - if self.environment.is_object(src): - obj_list.append(os.path.join(self.get_target_dir(target), target.get_basename() + '.dir', src)) - elif not self.environment.is_header(src): - if is_unity: - if '/' in src: - rel_src = src + else: + for src in gensource.get_outfilelist(): + if self.environment.is_object(src): + obj_list.append(os.path.join(self.get_target_dir(target), target.get_basename() + '.dir', src)) + elif not self.environment.is_header(src): + if is_unity: + if '/' in src: + rel_src = src + else: + rel_src = os.path.join(self.get_target_private_dir(target), src) + unity_deps.append(rel_src) + abs_src = os.path.join(self.environment.get_build_dir(), rel_src) + unity_src.append(abs_src) else: - rel_src = os.path.join(self.get_target_private_dir(target), src) - unity_deps.append(rel_src) - abs_src = os.path.join(self.environment.get_build_dir(), rel_src) - unity_src.append(abs_src) - else: - obj_list.append(self.generate_single_compile(target, outfile, src, True, - header_deps=header_deps)) + obj_list.append(self.generate_single_compile(target, outfile, src, True, + header_deps=header_deps)) src_list = [] for src in gen_src_deps: src_list.append(src) |