From 24339aa2113cf0a018109318e9900902ee5b0023 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Mon, 2 Dec 2013 19:54:33 +0000 Subject: Libraries without '-l' treated as relative paths. The following have the same effect on Windows: 'msvs_settings': { 'VCLinkerTool': { 'AdditionalDependencies': [ 'windowscodecs.lib', ],},}, 'link_settings': {'libraries': ['-lwindowscodecs.lib',],}, But this one is different: 'link_settings': {'libraries': ['windowscodecs.lib',],}, since this last one will attempt to find the library at third_party\skia\gyp\windowscodecs.lib or a place like this, instead of looking in the library paths. This also fixes capitalization of the affected libraries. R=bsalomon@google.com Review URL: https://codereview.chromium.org/99463002 git-svn-id: http://skia.googlecode.com/svn/trunk@12434 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/images.gyp | 2 +- gyp/xps.gyp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gyp') diff --git a/gyp/images.gyp b/gyp/images.gyp index eed2dba51f..45f5de038f 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -84,7 +84,7 @@ ], 'link_settings': { 'libraries': [ - 'windowscodecs.lib', + '-lwindowscodecs.lib', ], }, },{ #else if skia_os != win diff --git a/gyp/xps.gyp b/gyp/xps.gyp index 29d5e075a9..325853989b 100644 --- a/gyp/xps.gyp +++ b/gyp/xps.gyp @@ -25,8 +25,8 @@ [ 'skia_os == "win"', { 'link_settings': { 'libraries': [ - 'T2Embed.lib', - 'FontSub.lib', + '-lt2embed.lib', + '-lfontsub.lib', ], }, },{ #else if 'skia_os != "win"' -- cgit v1.2.3