aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/vs2010backend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-05-28 23:09:59 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-05-28 23:09:59 +0300
commitc2082146abd400f8b3f8841acbf2fd324d6cb43a (patch)
treef826e6226e626ed19b70f431c4b0ed4d915b5804 /mesonbuild/backend/vs2010backend.py
parentaac7f6ef1f1c1b5e8e1a296181f76eff203ef284 (diff)
parenta29d9c2c332bcf6147a6a87eeab408bc43fcd30b (diff)
downloadmeson-c2082146abd400f8b3f8841acbf2fd324d6cb43a.zip
meson-c2082146abd400f8b3f8841acbf2fd324d6cb43a.tar.gz
meson-c2082146abd400f8b3f8841acbf2fd324d6cb43a.tar.bz2
Merge branch 'nioncode-vs-generator'
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
-rw-r--r--mesonbuild/backend/vs2010backend.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 82d0dc9..355798d 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -96,11 +96,12 @@ class Vs2010Backend(backends.Backend):
sole_output = ''
curfile = infilelist[i]
infilename = os.path.join(self.environment.get_source_dir(), curfile)
- outfiles = genlist.get_outputs_for(curfile)
- outfiles = [os.path.join(target_private_dir, of) for of in outfiles]
+ outfiles_rel = genlist.get_outputs_for(curfile)
+ outfiles = [os.path.join(target_private_dir, of) for of in outfiles_rel]
generator_output_files += outfiles
args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)\
for x in base_args]
+ args = self.replace_outputs(args, target_private_dir, outfiles_rel)
args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", target_private_dir)
for x in args]
fullcmd = exe_arr + self.replace_extra_args(args, genlist)