diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-31 13:54:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-31 13:54:43 +0200 |
| commit | aff62a46114e1a80cdec7eebbacb0c42ad417708 (patch) | |
| tree | 85b0877bc31ed452679e999c4e3a3b6e0bff55a4 /mesonbuild/modules/windows.py | |
| parent | 4ae629d2aae7194ec1034c73e2df50b5f028e76b (diff) | |
| parent | 157549fe72dc9ce400c2587b536987b53da8f90b (diff) | |
| download | meson-aff62a46114e1a80cdec7eebbacb0c42ad417708.zip meson-aff62a46114e1a80cdec7eebbacb0c42ad417708.tar.gz meson-aff62a46114e1a80cdec7eebbacb0c42ad417708.tar.bz2 | |
Merge pull request #1258 from QuLogic/compile_resource-includes
Add include_directories to windows.compile_resources.
Diffstat (limited to 'mesonbuild/modules/windows.py')
| -rw-r--r-- | mesonbuild/modules/windows.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index 012f4d0..d034497 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -14,6 +14,7 @@ from .. import mesonlib, dependencies, build from ..mesonlib import MesonException +from . import get_include_args import os class WindowsModule: @@ -26,7 +27,16 @@ class WindowsModule: def compile_resources(self, state, args, kwargs): comp = self.detect_compiler(state.compilers) + extra_args = mesonlib.stringlistify(kwargs.get('args', [])) + inc_dirs = kwargs.pop('include_directories', []) + if not isinstance(inc_dirs, list): + inc_dirs = [inc_dirs] + for incd in inc_dirs: + if not isinstance(incd.held_object, (str, build.IncludeDirs)): + raise MesonException('Resource include dirs should be include_directories().') + extra_args += get_include_args(state.environment, inc_dirs) + if comp.id == 'msvc': rescomp = dependencies.ExternalProgram('rc', silent=True) res_args = extra_args + ['/nologo', '/fo@OUTPUT@', '@INPUT@'] |