From f51e125b949fdda350256c7132ee54c49ea53519 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 5 Jun 2013 18:35:22 +0000 Subject: [PATCH] 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 --- DEPS | 2 +- gyp/common_conditions.gypi | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index c2e5de9ca0..936875fcd2 100644 --- a/DEPS +++ b/DEPS @@ -10,7 +10,7 @@ use_relative_paths = True deps = { "third_party/externals/angle" : "http://angleproject.googlecode.com/svn/trunk@1268", "third_party/externals/freetype" : "https://android.googlesource.com/platform/external/freetype.git", - "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@1563", + "third_party/externals/gyp" : "http://gyp.googlecode.com/svn/trunk@1643", "third_party/externals/libjpeg" : "http://src.chromium.org/svn/trunk/src/third_party/libjpeg@125399", "third_party/externals/jsoncpp" : "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248", "third_party/externals/jsoncpp-chromium" : "http://src.chromium.org/svn/trunk/src/third_party/jsoncpp@125399", 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', ], }, },