diff options
| author | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 04:12:05 +0000 |
|---|---|---|
| committer | sebmarchand@chromium.org <sebmarchand@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-23 04:12:05 +0000 |
| commit | 384d081e7c9f6f3fab34adf0af1b8f73afed5b3b (patch) | |
| tree | 8bacb0a6e82920f884375a152bad8f07f57f51b2 /chrome/chrome_dll.gypi | |
| parent | 2fe743e8229962859b95adc9f32ca222795b93db (diff) | |
| download | chromium_src-384d081e7c9f6f3fab34adf0af1b8f73afed5b3b.zip chromium_src-384d081e7c9f6f3fab34adf0af1b8f73afed5b3b.tar.gz chromium_src-384d081e7c9f6f3fab34adf0af1b8f73afed5b3b.tar.bz2 | |
Re-enable custom user32 custom imports on VS2013.
It looks like this has been fixed in the Update 1 of VS2013
(this is a revert of https://codereview.chromium.org/27072004)
R=siggi@chromium.org, scottmg@chromium.org
BUG=309845
Review URL: https://codereview.chromium.org/144893004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index da6e449..1b1120b 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -92,12 +92,7 @@ '../ui/compositor/compositor.gyp:compositor', ], }], - ['OS=="win" and target_arch=="ia32" and MSVS_VERSION!="2013"', { - # TODO(scottmg): The assembler is very broken in VS2013 and - # crashes on the generated .asm file, so disable this for now. - # This should be revisited after a VS2013 update. See - # http://crbug.com/288948. - # + ['OS=="win" and target_arch=="ia32"', { # Add a dependency to custom import library for user32 delay # imports only in x86 builds. 'dependencies': [ @@ -156,7 +151,7 @@ 'OutputFile': '$(OutDir)\\initial\\chrome.dll', 'UseLibraryDependencyInputs': "true", }], - ['target_arch=="ia32" and MSVS_VERSION!="2013"', { + ['target_arch=="ia32"', { # Link against the XP-constrained user32 import library # instead of the platform-SDK provided one to avoid # inadvertently taking dependencies on post-XP user32 |