diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 06:18:24 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 06:18:24 +0000 |
| commit | 2b733b3e37e4003a2689d8b131629c98ab3a2e77 (patch) | |
| tree | 82f0be72c19243d32918b10fc9ba58ec418d3813 /third_party/iaccessible2 | |
| parent | 5b92bc6a9fa7bdf039cd15cb88889ea3732ffa2c (diff) | |
| download | chromium_src-2b733b3e37e4003a2689d8b131629c98ab3a2e77.zip chromium_src-2b733b3e37e4003a2689d8b131629c98ab3a2e77.tar.gz chromium_src-2b733b3e37e4003a2689d8b131629c98ab3a2e77.tar.bz2 | |
Make iaccessible2 write shared generated files to SHARED_INTERMEDIATE_DIR
BUG=97186
TEST=none
Review URL: http://codereview.chromium.org/7971008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/iaccessible2')
| -rw-r--r-- | third_party/iaccessible2/iaccessible2.gyp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/third_party/iaccessible2/iaccessible2.gyp b/third_party/iaccessible2/iaccessible2.gyp index 65b6895..ae60d5a 100644 --- a/third_party/iaccessible2/iaccessible2.gyp +++ b/third_party/iaccessible2/iaccessible2.gyp @@ -3,15 +3,8 @@ # found in the LICENSE file. { - 'includes': [ - '../../build/common.gypi', - ], - - 'target_defaults': { - 'include_dirs': [ - '.', - '<(INTERMEDIATE_DIR)', - ], + 'variables': { + 'midl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/iaccessible2', }, 'targets': [ { @@ -19,14 +12,18 @@ 'type': 'static_library', 'sources': [ 'ia2_api_all.idl', - '<(INTERMEDIATE_DIR)/ia2_api_all.h', - '<(INTERMEDIATE_DIR)/ia2_api_all_i.c', + '<(midl_out_dir)/ia2_api_all.h', + '<(midl_out_dir)/ia2_api_all_i.c', ], 'hard_dependency': 1, + 'msvs_settings': { + 'VCMIDLTool': { + 'OutputDirectory': '<(midl_out_dir)', + }, + }, 'direct_dependent_settings': { 'include_dirs': [ - # Bit of a hack to work around the built in vstudio rule. - '<(INTERMEDIATE_DIR)/../iaccessible2', + '<(SHARED_INTERMEDIATE_DIR)', ], }, }, @@ -37,8 +34,8 @@ 'dependencies': [ 'iaccessible2' ], 'sources': [ 'IAccessible2Proxy.def', - '<(INTERMEDIATE_DIR)/../iaccessible2/dlldata.c', - '<(INTERMEDIATE_DIR)/../iaccessible2/ia2_api_all_p.c', + '<(midl_out_dir)/dlldata.c', + '<(midl_out_dir)/ia2_api_all_p.c', ], 'link_settings': { 'libraries': [ |