diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-03 00:05:24 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-04-03 00:05:24 +0300 |
commit | b1be0a454701bb76d52b37c7b0f0d519d3751dfe (patch) | |
tree | 08ce93c2562fcc2cfa056f17875f8c5e0765c91f | |
parent | 9253e8f8cca32615a069ffb7bb9fd763fb7020b8 (diff) | |
download | meson-b1be0a454701bb76d52b37c7b0f0d519d3751dfe.zip meson-b1be0a454701bb76d52b37c7b0f0d519d3751dfe.tar.gz meson-b1be0a454701bb76d52b37c7b0f0d519d3751dfe.tar.bz2 |
Path fixing for great link justice.
-rw-r--r-- | build.py | 3 | ||||
-rw-r--r-- | xcodebackend.py | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -496,6 +496,9 @@ class StaticLibrary(BuildTarget): def get_import_filename(self): return self.filename + def get_osx_filename(self): + return self.get_filename() + class SharedLibrary(BuildTarget): def __init__(self, name, subdir, is_cross, sources, objects, environment, kwargs): self.version = None diff --git a/xcodebackend.py b/xcodebackend.py index d1bd8aa..199b366 100644 --- a/xcodebackend.py +++ b/xcodebackend.py @@ -598,7 +598,7 @@ class XCodeBackend(backends.Backend): headerdirs.append(os.path.join(self.environment.get_build_dir(), cd)) for l in target.link_targets: abs_path = os.path.join(self.environment.get_build_dir(), - buildtype, l.get_filename()) + l.subdir, buildtype, l.get_osx_filename()) dep_libs.append("'%s'" % abs_path) if isinstance(l, build.SharedLibrary): links_dylib = True |