diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-05 18:35:22 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-06-05 18:35:22 +0000 |
| commit | f51e125b949fdda350256c7132ee54c49ea53519 (patch) | |
| tree | 6a269d3e03ce270d9798f80e18de5aeef7238eab /gyp | |
| parent | 5a64902ee92847f53dfc5b211da19d074179be64 (diff) | |
Update gyp from 1563 to 1643 (take two).
Re-land 9445 (reverted 9448), but add back the libs no longer provided by gyp.
git-svn-id: http://skia.googlecode.com/svn/trunk@9450 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 64e7c13594..a53de0ef55 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -38,6 +38,20 @@ 'AdditionalDependencies': [ 'OpenGL32.lib', 'usp10.lib', + + # Prior to gyp r1584, the following were included automatically. + 'kernel32.lib', + 'gdi32.lib', + 'winspool.lib', + 'comdlg32.lib', + 'advapi32.lib', + 'shell32.lib', + 'ole32.lib', + 'oleaut32.lib', + 'user32.lib', + 'uuid.lib', + 'odbc32.lib', + 'odbccp32.lib', ], }, }, |