diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-07-01 14:43:51 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-07-01 20:50:47 +0530 |
| commit | 2f8eaa6ed41c0d10f2c27ce91aaf4f6d8f4e5abb (patch) | |
| tree | ba9751bba154ff2e7fe81de42168fbccfe5e841a | |
| parent | 1481715618b2f93d20475f9e892b54451c186670 (diff) | |
| download | meson-2f8eaa6ed41c0d10f2c27ce91aaf4f6d8f4e5abb.zip meson-2f8eaa6ed41c0d10f2c27ce91aaf4f6d8f4e5abb.tar.gz meson-2f8eaa6ed41c0d10f2c27ce91aaf4f6d8f4e5abb.tar.bz2 | |
vs: Fix paths of internal library dependencies
They are relative to the path of the vcxproj file, not relative to build root
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index bb13a2c..bdf9ced 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -634,8 +634,7 @@ class Vs2010Backend(backends.Backend): # Add more libraries to be linked if needed for t in target.get_dependencies(): lobj = self.build.targets[t.get_id()] - rel_path = self.relpath(lobj.subdir, target.subdir) - linkname = os.path.join(rel_path, self.get_target_filename_for_linking(lobj)) + linkname = os.path.join(down, self.get_target_filename_for_linking(lobj)) additional_links.append(linkname) for lib in self.get_custom_target_provided_libraries(target): additional_links.append(self.relpath(lib, self.get_target_dir(target))) |