diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 22:34:54 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 22:34:54 +0000 |
| commit | 608daa4e2a187e9ca49d2a39de05eda98d243544 (patch) | |
| tree | cb207dbb5c7e84bb4f55e6fae39c2e324c6c06e7 /win8 | |
| parent | 9355e2698e30209dac584a5a636826c0c6335747 (diff) | |
| download | chromium_src-608daa4e2a187e9ca49d2a39de05eda98d243544.zip chromium_src-608daa4e2a187e9ca49d2a39de05eda98d243544.tar.gz chromium_src-608daa4e2a187e9ca49d2a39de05eda98d243544.tar.bz2 | |
Make basictypes.h use stdint.h even with MSVC.
R=brettw
BUG=138542
Review URL: https://codereview.chromium.org/25559007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242946 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index f0d1c76..6debc33 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -12,13 +12,21 @@ '../../chrome/version.gypi', ], 'target_defaults': { + # This and the force include below is a workaround for intsafe.h in + # VS 2010. + 'msvs_system_include_dirs': [ + '<(DEPTH)/build', + ], 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'D2D1.lib', - 'D3D11.lib', - ], - }, + 'VCLinkerTool': { + 'AdditionalDependencies': [ + 'D2D1.lib', + 'D3D11.lib', + ], + }, + 'VCCLCompilerTool': { + 'ForcedIncludeFiles': [ 'intsafe_workaround.h', ], + }, }, }, 'targets': [ |