Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9100)

Unified Diff: chrome/chrome_exe.gypi

Issue 186333002: Add ftol workaround for VS2013 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index e6a5b25e2b2cad76044ccabfa1cb48fa06f43890..4bf28c85c45e5e6a28605cde66d99ec10c52fcc4 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -579,6 +579,14 @@
'app/client_util.cc',
],
}],
+ ['OS=="win" and target_arch=="ia32"', {
+ 'sources': [
+ # TODO(scottmg): This is a workaround for
+ # http://crbug.com/348525 that affects VS2013 before Update 2.
+ # This should be removed once Update 2 is released.
+ '../build/win/ftol3.obj',
+ ],
+ }],
['OS=="win" and component=="shared_library"', {
'defines': ['COMPILE_CONTENT_STATICALLY'],
}],
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698