diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-02 20:46:04 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-02 20:46:04 +0300 |
| commit | 363bc42c5c20d58e155781ffc5cc2694c40eac10 (patch) | |
| tree | 082b14834ecf44f5559e813c900a4df00a81e825 /vs2010backend.py | |
| parent | b057b061c3222fb3001e28371a5540623adaf010 (diff) | |
| download | meson-363bc42c5c20d58e155781ffc5cc2694c40eac10.zip meson-363bc42c5c20d58e155781ffc5cc2694c40eac10.tar.gz meson-363bc42c5c20d58e155781ffc5cc2694c40eac10.tar.bz2 | |
Started target out dir refactoring with some clarifying renamings.
Diffstat (limited to 'vs2010backend.py')
| -rw-r--r-- | vs2010backend.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vs2010backend.py b/vs2010backend.py index 268615b..e5cb3fe 100644 --- a/vs2010backend.py +++ b/vs2010backend.py @@ -40,17 +40,17 @@ class Vs2010Backend(backends.Backend): base_args = generator.get_arglist() for i in range(len(infilelist)): if len(infilelist) == len(outfilelist): - sole_output = os.path.join(self.get_target_private_dir(target), outfilelist[i]) + sole_output = os.path.join(self.get_target_private_dir_abs(target), outfilelist[i]) else: 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(self.get_target_private_dir(target), of) for of in outfiles] + outfiles = [os.path.join(self.get_target_private_dir_abs(target), of) for of in outfiles] all_output_files += outfiles args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)\ for x in base_args] - args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", self.get_target_private_dir(target)) + args = [x.replace("@SOURCE_DIR@", self.environment.get_source_dir()).replace("@BUILD_DIR@", self.get_target_private_dir_abs(target)) for x in args] fullcmd = [exe_file] + args cbs = ET.SubElement(idgroup, 'CustomBuildStep') @@ -221,7 +221,7 @@ class Vs2010Backend(backends.Backend): clconf = ET.SubElement(compiles, 'ClCompile') opt = ET.SubElement(clconf, 'Optimization') opt.text = 'disabled' - inc_dirs = [proj_to_src_dir, self.get_target_private_dir(target)] + inc_dirs = [proj_to_src_dir, self.get_target_private_dir_abs(target)] cur_dir = target.subdir if cur_dir == '': cur_dir= '.' |