backend/vs: ensure that build dir is preferred to src dir

Previously, the VS backend would add the the include directories
in the reverse order that the Ninja backend does it, which
means that the source directories would be preferred over
the build directories. For example, this would cause the
compiler to choose the file from the source directory
if a file with the same name is found in both.

Fixes 57ec097b5 ("vs: Use CompilerArgs() for compile and link args")
Fixes #11630

1 files changed, 2 insertions, 1 deletions

diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 5718004..47e19a4 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -1070,8 +1070,9 @@ class Vs2010Backend(backends.Backend):
                 for i in reversed(d.get_incdirs()):
                     curdir = os.path.join(d.get_curdir(), i)
                     try:
-                        args.append('-I' + self.relpath(curdir, target.subdir)) # build dir
+                        # Add source subdir first so that the build subdir overrides it
                         args.append('-I' + os.path.join(proj_to_src_root, curdir))  # src dir
+                        args.append('-I' + self.relpath(curdir, target.subdir)) # build dir
                     except ValueError:
                         # Include is on different drive
                         args.append('-I' + os.path.normpath(curdir))