diff options
Diffstat (limited to 'cook.py')
| -rwxr-xr-x | cook.py | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -252,10 +252,13 @@ class CC(Vec): def gen(self, *args, extra_args = [], include_dirs = [], dependencies = [], **kwargs): inputs = File.resolve(args) dependencies = flatten(dependencies) - + + include_dirs = [e for e in include_dirs] include_dirs += [d.include_dirs for d in dependencies if d.include_dirs] include_dirs = File.resolve(include_dirs) include_args = [self.mkinc(str(x)) for x in include_dirs] + + extra_args = [e for e in extra_args] extra_args += [d.cc_args for d in dependencies if d.cc_args] extra_args += include_args @@ -301,8 +304,11 @@ class CExe(Processor): def gen(self, name, *args, libs=[], dependencies = [], extra_args = [], **kwargs): libs = flatten(libs) dependencies = flatten(dependencies) - + + libs = [e for e in libs] libs += [d.libs for d in dependencies if d.libs] + + extra_args = [e for e in extra_args] extra_args += [d.ld_args for d in dependencies if d.ld_args] # Note: this is bad, perhaps take a "depends" also/instead @@ -533,6 +539,7 @@ _root = CMod(None, "") global this this = _root +this.cwd = Path.cwd global cook cook = AttrDict({ |