Add current dir to include directories when compiling resource

Fixes #15206

Author: bruchar1

mesonbuild/build.py

@@ -512,8 +512,8 @@ def to_string_list(self, sourcedir: str, builddir: str) -> T.List[str]:
         """
         strlist: T.List[str] = []
         for idir in self.incdirs:
-            strlist.append(os.path.join(sourcedir, self.curdir, idir))
-            strlist.append(os.path.join(builddir, self.curdir, idir))
+            strlist.append(os.path.normpath(os.path.join(sourcedir, self.curdir, idir)))
+            strlist.append(os.path.normpath(os.path.join(builddir, self.curdir, idir)))
         return strlist
 
 @dataclass(eq=False)

mesonbuild/modules/__init__.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 import dataclasses
+import os.path
 import typing as T
 
 from .. import build, mesonlib
@@ -66,8 +67,8 @@ def get_include_args(self, include_dirs: T.Iterable[T.Union[str, build.IncludeDi
             if isinstance(dirs, str):
                 dirs_str += [f'{prefix}{dirs}']
             else:
-                dirs_str.extend([f'{prefix}{i}' for i in dirs.to_string_list(srcdir, builddir)])
-                dirs_str.extend([f'{prefix}{i}' for i in dirs.get_extra_build_dirs()])
+                dirs_str.extend([f'{prefix}{os.path.normpath(i)}' for i in dirs.to_string_list(srcdir, builddir)])
+                dirs_str.extend([f'{prefix}{os.path.normpath(i)}' for i in dirs.get_extra_build_dirs()])
 
         return dirs_str
 

mesonbuild/modules/windows.py

@@ -155,6 +155,9 @@ def compile_resources(self, state: 'ModuleState',
                     build.IncludeDirs('', [], False, [os.path.join('@BUILD_ROOT@', self.interpreter.backend.get_target_dir(d))])
                 ])
         include_directories = self.interpreter.extract_incdirs(kwargs)
+        self_dir = build.IncludeDirs(state.subdir, ['.'], False)
+        if self_dir not in include_directories:
+            include_directories.append(self_dir)
         extra_args += state.get_include_args(include_directories)
 
         rescomp, rescomp_type = self._find_resource_compiler(state)