Skip to content

Commit

Permalink
Fix #2326: Workaround before update to VS2013 update 2
Browse files Browse the repository at this point in the history
This is upstream issue #348525 and #330658
  • Loading branch information
rogerwang committed Sep 12, 2014
1 parent 4a08e10 commit afdc6a6
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions nw.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,14 @@
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
],
}],
['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.
'<(DEPTH)/build/win/ftol3.obj',
],
}],
['OS=="win"', {
'sources': [
'<(DEPTH)/chrome/browser/ui/views/constrained_window_views.cc',
Expand Down

0 comments on commit afdc6a6

Please sign in to comment.