From d4638a9cf4bd9f61e79060ddc102cf7fc221dcd5 Mon Sep 17 00:00:00 2001 From: mittorn Date: Tue, 9 Apr 2019 09:43:12 +0000 Subject: [PATCH] msdev: find relative include path --- scripts/waflib/msdev.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/waflib/msdev.py b/scripts/waflib/msdev.py index eb229526..c4c5b380 100644 --- a/scripts/waflib/msdev.py +++ b/scripts/waflib/msdev.py @@ -592,7 +592,13 @@ class MsDevProject(MsDev): for dep in deps: uselib_incs = bld.env['INCLUDES_%s' % dep] for uselib_inc in uselib_incs: - includes.append(uselib_inc) + root = bld.path.abspath().replace('\\', '/') + pref = os.path.commonprefix([root, userlib_inc]) + if pref == root: + node = bld.root.find_dir(include) + if node: + includes.append(node.path_from(gen.path).replace('/', '\\')) + incluses.append(userlib_inc) return includes def get_compiler_defines(self, gen):