diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-09-22 20:40:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 20:40:27 +0300 |
| commit | 524a95fa62a6e0cb77e53d7b38d5c2d59a75e449 (patch) | |
| tree | 145b0b48897167c0892df635bbfb40e71760974c /mesonbuild/backend/vs2010backend.py | |
| parent | 68eca11cc641cb02c7755f1e44fa3301863eacfd (diff) | |
| parent | 01ddf3ac13930ce077603db9e4823339cc4dc4d3 (diff) | |
| download | meson-524a95fa62a6e0cb77e53d7b38d5c2d59a75e449.zip meson-524a95fa62a6e0cb77e53d7b38d5c2d59a75e449.tar.gz meson-524a95fa62a6e0cb77e53d7b38d5c2d59a75e449.tar.bz2 | |
Merge pull request #9274 from anarazel/fix-vs-static-generated
backends/vs: Set ObjectFileName for generated sources.
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 4dc4679..87aef93 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1342,6 +1342,8 @@ class Vs2010Backend(backends.Backend): self.add_additional_options(lang, inc_cl, file_args) self.add_preprocessor_defines(lang, inc_cl, file_defines) self.add_include_dirs(lang, inc_cl, file_inc_dirs) + s = File.from_built_file(target.get_subdir(), s) + ET.SubElement(inc_cl, 'ObjectFileName').text = "$(IntDir)" + self.object_filename_from_source(target, s) for lang in pch_sources: impl = pch_sources[lang][1] if impl and path_normalize_add(impl, previous_sources): @@ -1356,6 +1358,7 @@ class Vs2010Backend(backends.Backend): else: inc_dirs = file_inc_dirs self.add_include_dirs(lang, inc_cl, inc_dirs) + #XXX: Do we need to set the object file name name here too? previous_objects = [] if self.has_objects(objects, additional_objects, gen_objs): |