diff options
| -rwxr-xr-x | interpreter.py | 2 | ||||
| -rwxr-xr-x | shellgenerator.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/interpreter.py b/interpreter.py index 82b473e..7707b82 100755 --- a/interpreter.py +++ b/interpreter.py @@ -138,7 +138,7 @@ class Executable(BuildTarget): class StaticLibrary(BuildTarget): def __init__(self, name, subdir, sources, environment): - BuildTarget.__init__(self, subdir, name, sources) + BuildTarget.__init__(self, name, subdir, sources) prefix = environment.get_static_lib_prefix() suffix = environment.get_static_lib_suffix() self.filename = prefix + self.name + '.' + suffix diff --git a/shellgenerator.py b/shellgenerator.py index 6b98b65..963d914 100755 --- a/shellgenerator.py +++ b/shellgenerator.py @@ -151,7 +151,8 @@ echo Run compile.sh before this or bad things will happen. break if compiler is None: raise RuntimeError('No specified compiler can handle file ' + src) - abs_src = os.path.join(self.environment.get_source_dir(), src) + abs_src = os.path.join(self.environment.get_source_dir(), target.get_source_subdir(), src) + print(target.get_source_subdir()) abs_obj = os.path.join(self.get_target_dir(target), src) abs_obj += '.' + self.environment.get_object_suffix() commands = [] |