aboutsummaryrefslogtreecommitdiff
path: root/backends.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-03-20 00:34:37 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2014-03-20 00:34:37 +0200
commit91633914ede0668d544fafa46e8d8dca20dd313e (patch)
treefb045436d37b3c26ef2617897983daaca05d6802 /backends.py
parent94ab24cda7430d107430034b04694ea63e945a74 (diff)
downloadmeson-91633914ede0668d544fafa46e8d8dca20dd313e.zip
meson-91633914ede0668d544fafa46e8d8dca20dd313e.tar.gz
meson-91633914ede0668d544fafa46e8d8dca20dd313e.tar.bz2
Fix include dir.
Diffstat (limited to 'backends.py')
-rw-r--r--backends.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/backends.py b/backends.py
index 7ef805f..0c8c52a 100644
--- a/backends.py
+++ b/backends.py
@@ -1295,7 +1295,8 @@ class Vs2010Backend(Backend):
def gen_vcxproj(self, target, ofname, guid):
down = self.target_to_build_root(target)
- proj_to_src_dir = os.path.join(down, self.build_to_src, target.subdir)
+ proj_to_src_root = os.path.join(down, self.build_to_src)
+ proj_to_src_dir = os.path.join(proj_to_src_root, target.subdir)
(sources, headers) = self.split_sources(target)
buildtype = 'Debug'
platform = "Win32"
@@ -1374,7 +1375,7 @@ class Vs2010Backend(Backend):
for i in d.incdirs:
curdir = os.path.join(d.curdir, i)
inc_dirs.append(self.relpath(curdir, target.subdir)) # build dir
- inc_dirs.append(os.path.join(proj_to_src_dir, curdir)) # src dir
+ inc_dirs.append(os.path.join(proj_to_src_root, curdir)) # src dir
inc_dirs.append('%(AdditionalIncludeDirectories)')
ET.SubElement(clconf, 'AdditionalIncludeDirectories').text = ';'.join(inc_dirs)
preproc = ET.SubElement(clconf, 'PreprocessorDefinitions')