Index: pylib/gyp/generator/msvs.py |
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py |
index 517ce3c623ae0e9b695cdff0e717b0279627acd8..f529d39a98d37c76b5eda390199f454cdd465dd1 100644 |
--- a/pylib/gyp/generator/msvs.py |
+++ b/pylib/gyp/generator/msvs.py |
@@ -1109,7 +1109,8 @@ def _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config): |
for this configuration. |
""" |
# Get the information for this configuration |
- include_dirs, resource_include_dirs = _GetIncludeDirs(config) |
+ include_dirs, midl_include_dirs, resource_include_dirs = \ |
+ _GetIncludeDirs(config) |
libraries = _GetLibraries(spec) |
library_dirs = _GetLibraryDirs(config) |
out_file, vc_tool, _ = _GetOutputFilePathAndTool(spec, msbuild=False) |
@@ -1137,6 +1138,8 @@ def _AddConfigurationToMSVSProject(p, spec, config_type, config_name, config): |
# Add the information to the appropriate tool |
_ToolAppend(tools, 'VCCLCompilerTool', |
'AdditionalIncludeDirectories', include_dirs) |
+ _ToolAppend(tools, 'VCMIDLTool', |
+ 'AdditionalIncludeDirectories', midl_include_dirs) |
_ToolAppend(tools, 'VCResourceCompilerTool', |
'AdditionalIncludeDirectories', resource_include_dirs) |
# Add in libraries. |
@@ -1192,10 +1195,14 @@ def _GetIncludeDirs(config): |
include_dirs = ( |
config.get('include_dirs', []) + |
config.get('msvs_system_include_dirs', [])) |
+ midl_include_dirs = ( |
+ config.get('midl_include_dirs', []) + |
+ config.get('msvs_system_include_dirs', [])) |
resource_include_dirs = config.get('resource_include_dirs', include_dirs) |
include_dirs = _FixPaths(include_dirs) |
+ midl_include_dirs = _FixPaths(midl_include_dirs) |
resource_include_dirs = _FixPaths(resource_include_dirs) |
- return include_dirs, resource_include_dirs |
+ return include_dirs, midl_include_dirs, resource_include_dirs |
def _GetLibraryDirs(config): |
@@ -2929,7 +2936,8 @@ def _FinalizeMSBuildSettings(spec, configuration): |
converted = True |
msvs_settings = configuration.get('msvs_settings', {}) |
msbuild_settings = MSVSSettings.ConvertToMSBuildSettings(msvs_settings) |
- include_dirs, resource_include_dirs = _GetIncludeDirs(configuration) |
+ include_dirs, midl_include_dirs, resource_include_dirs = \ |
+ _GetIncludeDirs(configuration) |
libraries = _GetLibraries(spec) |
library_dirs = _GetLibraryDirs(configuration) |
out_file, _, msbuild_tool = _GetOutputFilePathAndTool(spec, msbuild=True) |
@@ -2959,6 +2967,8 @@ def _FinalizeMSBuildSettings(spec, configuration): |
# if you don't have any resources. |
_ToolAppend(msbuild_settings, 'ClCompile', |
'AdditionalIncludeDirectories', include_dirs) |
+ _ToolAppend(msbuild_settings, 'Midl', |
+ 'AdditionalIncludeDirectories', midl_include_dirs) |
_ToolAppend(msbuild_settings, 'ResourceCompile', |
'AdditionalIncludeDirectories', resource_include_dirs) |
# Add in libraries, note that even for empty libraries, we want this |